S3 -> file uploading race condition fixed, and even more