improving logging and general instrumentation