Add Email validation, and make some validation optional

And change the typo error on line 118 too