Working cumulative table, many fixes
removed tor's