minor edits
minor edits -- refactor
doc edit (wip)