Some more changes

Getting close to User Auth being all set. Can you actually look through this and see if your more-Java-expert eyes spot anything that's super weird?