Checkpoint
Fixes + instrumentation