rewrote MatchFinder ; take a big hard look at that class, I rewrote it twice today; not yet tested and Match class not yet adapted