comments and fix ups
bug fixes for login stuff
Merge origin/master
ALWAYS CLEAN AND BUILD