Minor update
Further merge from development branch
Adapting MCC and progressing Millar.

MCC DPN refactor (still error in calculating C!) + effort at Millar
clock (won't compile yet).