Add non-breaking spaces and other minor changes.