mailer for comments
comment improvements
merge fixes