minor fixes + instrumentation