more db fill, bug fix