Added a dataset + small fixes