Fix signup and add a few more fields