tracing improvements