More edits (looking at both Pfaffmann and Schettino now)