Final touchups for email verification and bug fixes