more fixes to the upload system.