Formatting and minor content changes

Made a few small formatting changes, and some small wording fixes to make
everything a bit more cohesive.