more tweaks to organizations

Follows up on #120