updated email messages, and cleaned up sending process