I have th esame problem with hesitation, surging and rough idle when stopped in drive. I took it in and recieved a call today from the Ford dealership telling me that they would need to 'reprogram and upgrade the computer' at a cost of 120.00. Seems like they wouldnt charge for that. Anyway, hope that helps!
