Bugfixes and new organization docs