I have been having the same problems kind of... It sometimes surges, sometimes revs high and it accelerates when in gear. I've been trying everything and not getting anywhere. I've replaced the TPS, intake control valve, MAP... I've been cleaning everything, checking for vacuum leaks and haven't found anything that seems to make a difference. I'm about to change my intake gasket next... I don't know what to do if this doesn't work.