More minor edits and revisions, getting close.