Traceprogram improvements