Fix EDCM templates.
General cleanup.
Correct labelling of model M datasets.