Extremely Basic User Management, other minor fixes