email verification and minor changes