A whole bunch more edits