Minor consistency fixes
added email templates