fixes and adding tracer class