Some discussion edits