Fix up more code. Email validation.