More work

still not finished, some bugs in full truncation