Tracing v0.99

another set of updates