smaller changes in db layout