Fix bug with MatchingTable::matches. Codestyle fixes
Filename fixes