Adding fixes for chcekboxes and radios - seems to be less broken now