- minor edits and comments