Slight tweaks, to be consistent with presentation slides. No functional changes.