User model changes and other small things