Fixed a malformed MATCH bug. Code cleanup.
Updated README.txt