minor fixes, convert data sources to streaming pipes of fire