many minor edits