Checklist bug fix + minor changes.