some fixes
Email service with Freemarker added