Remove the Idle Control Valve nad clean it with a rag and some light penetrating oil. Make sure it opens and closs smoothly and isn't jammed up with oil or otherwise faulty. Check for vacuum leaks, all the hoses and connections to the intake manfold need to be double checked, air getting in will cause a lot of weird behaviour...