Organizations: Lots of tweaks/fixes