more diagnostic edits