Fix/misc fixes

I think this might be going in the wrong direction. Either "Username" or "Name" is preferable