Added Tracer Manager.
Also some minor cleanup.