rework debugging/tracing features