Bug fixes + almost completed checklist controller