Checkpointing
Include Vjeko's instrumentation
Some minor changes and comments
Some comments
Merge branch 'instrumented'