Fix some comments
Fix email template