Shallow reorgs
added checkpoints
Merge remote-tracking branch 'origin/softreorg'