Comments and proposed changes.

Just some review comments.