More work on the emails and tidy up the details it sends