validations added, email message updated