fixing things
tweaking mailer files