Fixed bug and removed email (just fill it in)