More improvements to matching and correlating