Fixed Checkpoints

And some other small changes.