bug fixes
bug fixes
bug fixes and new email template