Proposed changes.

Just some things I did when I was eating lunch. Please review.