a few template changes