Add user manager, authentication.  Some tweaks.