More Auth changes

Auth changes with some more testing