Teplmpate updates

Updated a few templates with small fixes that were requested