fixing some of the template related syntax issues from the last commit that I had missed