new user class, and some fixes