various updates to s3 parsing
various s3 updates
various s3 updates