Slight Fixes. Stopped it from breaking for nested sets, but they still get flattened.