email field, minor fixes