some changes to the ccm stuff. Not yet tested at home because pymorse was not installed properly.