changed a bunch of templating related things