s3 fixed, tests passing
merge with develop