more template stuff, Fixes #1 fixed bugs relating to deleting a marker service