some changes to signup and cleaning up