1. fix a bug in CPDIMPM with respect to memory allocation
2. update enriched CPDI2, not done yet