Updates to matching algorithm
replace false positive checks with better REGEX

Big improvement in match algorithm