Hello everybody, kind of new here so bare with me.

I own a 2001 Volvo S60. Stick shift with no turbo. Great car and love driving it. but lately I have been having a problem. When I press on the accelerator my rpm's do not rise smoothly. It will go up until around 1500 then do a mini hickup, go down a bit and then surge back up and accelerate fine afterwards. I was able to get rid of that by cleaning the MAF sensor and cleaning the ETS. Now it accelerates perfectly without any hickups.

A new problem arose though...when I drive the RPM is fine, when I drop the clutch in anticipation of a stop though, the RPM does NOT return back to its normal idling speed. Instead it stays around 1200 sometimes 1500. And the weird thing is that it will stay up right until I come to a complete stop. As soon as I stop completely or a few seconds after a complete stop, the RPM drop down below 900 then does a few bobs and stabilizes around 900.

I am at a complete loss and cannot figure out what may be the problem. I have no error codes off of the computer. There used to be errors related to the air flow sensor but now their gone. I noticed that the ETS is a white tag, and I believe I read somewhere that this means that it is the original and was not modified by Volvo to try and improve their not so good design.

Any ideas and suggestions? They are all welcome.
Thanks.