fix and comment templates better