various hardening changes and better instrumentation