more s3 work/ refactorings