Added CMS and bugfixes