db changes and lots of updates