Minor template updates; last commit fix