various fixes / rework for the s3 uploading