Added checkbox support, and fixed radios