merge PR: small updates to the user model and flesh out the user spec