more fixes to checkbox and radio button handling