update lots of internals to use cm11 base