Checkpoint: general improvs