data source + minor fixes