Just some minor stuff fixed after running sonar.
Refactored connection code from SuperDAO into ConnectionProvider.
Somewhat less horrible implementation. Not perfect by any stretch of the imagination, but it should be less horrible..
some cleanup based on sonar reports.