Highlight matches
Some refinements; modify only applies to 1v1
Improved table diffing