Ok I have a S2 and gearbox was cream crackered so had a S1 box (that I got off a mates mate, which supposedly has been reconditioned) fitted to it today, still using the mk4 linkage and car wouldn't stay in 1st or 3rd gear. So took it back to garage and they adjusted linkage and it's a lot better - stays in 1st but sometimes comes out of 3rd when I come off the throttle. The box doesn't make any funny noises ...

Is the box knackered or Does the linkage need a little more fine adjusting?
How should I go about adjusting the linkage? Should I follow http://i2.photobucket.com/albums/y44/cabrst/page35.jpg