Configmgr improvements

all so far is pretty safe/minimal.

more is possible/likely