Some minor fixes

I've thought these minor adjustments, like reduce amounts of markers created or avoid overwriting match-data so often, may be interesting.