Various config changes and comments