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