modified some of the heuristics to make matching more accurate, ran parsers to completion