Fixed a few things (esp. with tables)