Fixed problem with connection leaks in DataSource, continued refactoring of Finder and Controller.