Two really nice tools to have for the waterpump job are a 3/8" "wobble-head" extention and a set of Gear Wrench metric wrenches. I bought the wobble extension at Pepboys. The better quality gear wrenches are sold at Sears. Don't forget to install a new thermostat. And I agree with the others, replace your bypass hose, tensioner and serpantine belt while you are at it. They have to come off to do the job, so don't reinstall the old ones.

By the way, don't drive yourself crazy trying to figure out how to take the fan off. There is one center bolt you can use, but it requires a special tool to hold the fan while you undo the bolt. I removed my fan by undoing the bolts that hold the plastic fan to the metal fan hub. There are 4 bolts, and I think you need a 5mm hex bit socket to remove them. Its tight in there, but overall easy to remove the fan this way.

GregS