more template adjustments