More work on reworking the match file.
Slowly fixing things.