Improved the trace messages