Fixes minor bugs, improves User model