Well the problem has come back, I put a new maf on and it fixed it for about two weeks with only one hiccup. I noticed when I drove it saterday that it was having a rough idle, and I knew the problem was coming back. This morning it was idling fine then under light acceleration it was missing, so I shut it off and restarted it and the missing seemed to be better but still there and it wouldn't shift till 2500rpm when it would usually shift at 1900rpm. So I restated it again, and that fixed it for the drive. I'm sure it will be back when I leave work.
Any ideas? I'll get the codes read after work.