more s3 changes