Fixed checkpoints and other additions.