Tidy up tracing and update readme