Form name fix, and added support for radio and checkboxes