Fix for tiny datasets
tweaks
Allow random variation in number of items