cleanup and login/signup fix