fixing terminology
more minor edits