Checkpointing...
Bug fixes