All CMLA-requirements should now be fulfilled.
Also tidied up even more.