Add timeout handling that may or may not work. Improve upload progress display.