Corrected formdata import and other minor changes