Lots of random fixes
DB update