Small tweaks to support really complex datasets

I like that, added