template fixes after code review