fixes and cleanups for new auth model