fileupload and other minor fixes