Reformatted DbConnector. Plus more fixes.