Checkpoint, very half done
updates and some clarification