updated templates, comments