Added a few changes, and usernames to Users