refactor email messages
comments
update comments
more comment updates