Brennannovak feature/better smtp env variables

brought the branch up to date