more debug instrumentation