minor updates to multi-dimensional return