Typo fix, and other things.

First part