Added and modified a few tables and cleaned up all of the names of the ids in each table