added a few things to instrumentation