Drews cm7 tweaks