DB improvements

+ naming convention stuff done a little