Improved to 18059 matches

Lots of code could still be cleaned up, but I am going to rework it for
phrase based matches, so don’t want to do that now.

All changes are described in the updated README