bugfix+ update

more logical handling of marker removal