There was actually something about multimple parents for MP terms so I
did a few other changes.