I had the MAF unplugged today when I drove it around and it idled like garbage, and on cold start it would rev between 400-2500 rpms without me even touching the gas, so the MAF should be fine. I plugged it back in and the initial 1500 rpm problem came back though. My friend just picked me up a front o2 sensor, so that should help the problem a little or completely. In upper rpms it runs fine. Fluid power throughout the powerband if it's above 2000. She's only had the car for about 3 weeks so I haven't been able to try different gas yet, but the only 2 fill ups were from BP 87 (My GTI only likes BP 93 so I thought i'd stay with them). We are both away at school now so my tools and such aren't always handy until weekends I head home, but I do have access to my friends scanner. I'm first going to replace the o2 sensors and take it from there. I also want to clean the MAF better than I did before just to make sure. As for the IAC, when I cleaned the TB it seemed fine and seemed like it was working properly, but I might keep an eye on that as well. No codes yet, other than the MAF being unplugged, so the car really isn't making this an easy diagnosis. Thanks for the input though. I'll keep updating as I keep trying new things.