I'd go ahead and reset the comp first. That helped with me bad idle/throttle surge. Sounds like it could be the IAC valve or maybe even the throttle position sensor (TPS) if you saying the RPM's rise when coming to a stop.

Might want to look into the TH fix as well. smile

-neal

99 SVT...modified
96 GL....the beater
"I live my life a quarter mile at a time. For those 14 to 15 seconds, 16 if I get tire spin, or get a bad jump, or possibly if I have a friend in the car, I'm free."