checkboxes & minor fixes. TBD more