Add wing/doc comment colors, other small tweaks.
Merge remote-tracking branch 'origin/master'