Baldur/tweak mapmatching

changes to mapmatching, guided by maine ;)