Small edits and comments