fix cpp detection.
clean up patch
missing comma in settings file