add mailer, plus some other crap