Adding state checkboxes, time to review & qa, graphs made accurate