Uploader fixes

Uploader fixes.

Some cosmetic stuff. Some bugs. Will possible add more until this gets merged