small improvements to the tracer