fixed variable names, detects more