more robust checkbox handling; switched interface to SWitch