add fixes for all current bugs, citation, and adding user to a default organization are still buggy