Lots of updates
Fix to authentication failure