Some proposed changes and some comments.

For some reason, this wordprocessor thinks I am called "testuser".