upload improvements, hopefully fixes most issues