Better emails
Some fixes