Instrumentation, plus optimizations
Fixes and optimisations