latest tweaks including support for radio buttons