added tracing
added some tracers