wip, improvements on db connector