Fix up signups for user type 2, creation of thing3, clean up some code