tracing and email fix