More config changes and formatting.