fix errors and false-pos