s3 improvements