I shimmed the gas cap out with another gasket, wasnt sealing tight, CEL went out for a few days. I am thinking it is the MAF, but you brought up another point about the battery. My car sat for a year and the battery died a few times, still works fine as far as starting goes.