Some more edits