Various correction and creation of the cms module