Emails, plus a couple of fixes