minor edits and re-org