remove ThatMarker stuff to make this branch independent
rename the function that calls all markers post-processing
documentation improvement
more needed cleanup