Spacing fixes for tools.

And a spelling fix while we're at it.
Merge pull request #8296 from Rivet-the-Zombie/now-we-fix-tools

Spacing fixes for tools.