initial fixes, data sources working