more improvements to authorization