fixed major bugs from switching to using Email::Stuffer