Fixed datasetgenerator
Ready for clustering module