improved marker behavior, other stuff
Merge pull request #8 from econ24/master

improved marker behavior, other stuff