fixed lots of datasource issues.  still not working with the jobs model, however