small changes and removed e-mail confirmation field