misc changes
Getting the adding and removing of templates working