Minor cleanup.
Fix some typos and minor issues.