some minor edits to documentation, TODO, etc