get some user admin shit working, general cleanups