Usernames and other improvements