fix minor stuff & refacto traceController