1. changed to non-static methods
2. updated email template variables
3. bug fixes