Fixed most cases, may have to ignore string comparisons, line 127-128