Matching

Buxfixes in the matching, it's almost done now!