merging in multiple fixes and s3 code