Minor tweaks to D3 discovery, typo tweaks for the centauress.
Merge remote-tracking branch 'upstream/master'