Did a few minor changes to email handling.