Fixed table, added todo.