Checkpoint, many small changes