various s3 updates