checkbox to radio button + various changes