refactoring; minor conf changes