some templates corrections