reorganized DB stuff
..