16V Brake servo and MC upgrade

Firstly I know this has been covered loads and i have read the guide on the link below for this upgrade but i just need some clarity on a few things.

http://vwgolfmk1.org.uk/index.php?page=cedi&type=misc&id=28

I am going to use a MC and servo from a mk2 16v in my gti cabro for better brakes. Is the only modification i need to do shortening the thread to match the original servo?

In the guide it starts talking about different MCs you might need to use to fit alongside the dizzy if you have an abf conversion. As i am using the standard MC that comes with the 9" servobecause it will fit with my standard gti engine is it simply a case of re-connecting the old brakes lines and then bleeding the brakes? 

No one?

Got my servo in the post and want to crack on with the upgrade..

Yes just cut the thread down to same length as stock, but don't forget to swap the clevis pin fitting over from old one too!

Pretty much yes, Does the new mc have 4 outlets or 2?

Great cheers. I am not actually sure how many, it hasn't arrived yet and i couldn't see in the pictures on ebay.

Without trying to sounds too stupid where does the clevis pin sit or will it be obvious when i take the old one out? 

Servo and MC arrived. Mine is the same as the one pictured in the guide so fingers crossed it all goes well this weekend!