refactor uploader for user feedback
Fix upload arg order
Merge remote-tracking branch 'origin/data_collection' into data_collection