fixed some templates