Lots of new data sources, fixed a bug with the logger