Added email delivery to production and cleaned up a few other settings