Additions to User model, minor tweaks elsewhere.