failing nicer on no such marker
warning before overwriting marker, allow cancel of overwrite
updating ancillary files
Merge branch 'dev'