Changes to db and fake_data

I tried but it is too annoying to care about