Updates to align the checklist with reality more