clean up checkboxes, fix serviceprovider