yet another change of dp correction.  go back to geometric and also factor out selftransitions that are outside length correction