solves a couple of mistakes in the templates