more templates cosmetic updates, added on missing fields