Tidy up comments templates and sort out email sending settings