fix bugs introduced in PR#2#3

strega-nil wants to merge 4 commits intosoasis:mainsoasis/vargs:mainfrom

strega-nil:organization-bugsstrega-nil/vargs:organization-bugsCopy head branch name to clipboard