Improved tracer output a bit