fixing up templates