add cwm, general tweaks