Diagnosis was a faulty throttle position sensor, had it replaced. We'll see if that's really all there was to it. Still idling a little bit high.