Table changes

Accidentally pull-requested before and kind of broke everything. This is my attempt to fix it! All a learning experience lol