Checkpoint update, tweaks, formatting