WIP: fix table