Handle fiel uploads, checkboxes, and multi select options better. Closes #2