Fixed some stuff, continued work on table
Merge remote-tracking branch 'origin/master'