Bugfixes, cosmetic, authorization fix