Fixes, dataset additions
More fixes