Checkpoint

Corrections. More to come.