Small tweaks to support really complex datasets

Yep, but I prefer to not sleep instead of doing a sleep(0)... just personal taste