Update user model and minor tweaks