tweaked some of the templates