upload improvements (working status!)

This is in working status. Enough for today so saving till tomorrow :-)