More db works, some changes too.