change to checkboxes and bug fixes
change to checkboxes and bug fixes