One pass of revisions

Trying to smooth out some rough spots towards 1.0