Cleaned up getting user info. Bugs were fixed