Well... I replaced the O-rings on the injectors and replaced a lot of the vacuum lines/fittings. I'm now getting an intermittent P0131 and still have the surging idle in P and N. I tried unplugging the mass air flow sensor and the idle evened out in default mode. What does that tell me? replace the O2 sensor, or the MAF. or both??