modified mailer
merge complete
corrected typos