Config + little changes.