small edits and comments