still more minor edits