Tidying EDCM and self-documentation.
Miscellaneous cosmetic and minor fixes.