Final edits before 8/8 submission