Improve Uploader

fixes #674, #198