Address comments form @adamrp

changed email and error messages
cleaned up code