Lots of authentication changes
Minor changes?