Minor formatting changes and typo fixes

Some minor changes, mostly typo fixes.