Small edits to user class. Forgot to switch to new branch, doing that
now.