Initial round of revisions

This is a rough draft of revisions.