some more updates for handling drives and s3 buckets