Doc, configuration improvements