it sounds like this could be an issue with your Oxygen Sensor. Can you smell petrol while at a stop light?