Minor changes and comment edits