Added ability to use checkpoints.  Cleanup.