bugfixes, minor erfactor, better datasource category