Adding some volume stuff that was missing and doing tons of renaming plus some small fixes
removing silly database stuff