fix a number of issues with data sources
set function visibility