Various minor edits. Minor revisions to unit tests.