Also worth giving the connections on the flywheel sensor a clean as they can cause those sort of problems when they are dirty.