Some minor changes, mainly to User class