fixes to dataset and else