Signup work plus small tweaks