dataset generator improvements