Some improvements.

Mainly typo fixes.