More messing around with config changes. Messy work in progress..