Some cleanup, added settings and logging to the dataset