fixed various uploader bugs