If the car is just dieseling, I would check the timing and/or idle mixtures.

The rest of the info on cleaning stuff is good none-the-less

If you ever find yourself in a fair fight, your tactics suck.