Some minor fixes

[sergv]

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

[fgallina]

code change a fair amount since this, will have the recommendations into mind when making changes. Thanks.