Added support for iupload and more bug fixes