Fixed cross contamination of marker.
Fixed more cross contamination of markers
More epic refactors of history!