Some interface changes and two redundancy fixes.
Measuring upload time using a StopWatch.