improved marker behavior, other stuff