updating some templates from #66