Fix the checkboxes, still more to do