Some tamplate changes mainly cosmetic.