Minor edits.
More conversions.