fixed major bugs, made sure scan results are correct
submit commit