Cm 11.0

few changes so it will build. ;)