add truncation and censoring
tune-ups and fixes