Several small edits