More email adjustments

Fixing file name/format of email issues