Preparing sign-up

a few bugs left