Lot's of updates, login cleanup, some other stuff...

2017-05-11, Gary Kramlich