further refinements to tool/module/provider management