Change of map types

(and removing old matches file I found....)