Template changes for comment implementation
Fix broken paste template
Class typo