Fixed and improved the dataset preparation.