fixes to user model