Some config changes and comments