More edits, plus adjustment to spacing