Improve self-links
Improve formatting
fixup! Conform to American English