Make major DB additions/changes DB columns now do not have prefixes!
Change most of remaining code to match DB changes
Fix a missed code change to create updated better DB