Add FileFormField and ImageFormField support

  Also clean up errors found in baseforms and subroutines while debugging