Move back to S3, minor edits