Routing tweaks and fixes, modifies mailer