fix tables layout and update TODO.txt