final tweaks to S3 stuff