table is computed correctly
bugs fixed