Fix Scrtip line highlighting + tracing updated