More cleanup.
Renames stuff.
Fixes column names.
Adds another update.