Already have Haynes manual, mine was even more of a bargain and came with the car

Although its handy for taking things apart and putting things back together I find it much more informative to ask on forums as to common faults and fault finding techniques.

Cheers for the trick with the speedo cable i'll have a go tonight

As for the sun roof, definitely double check the drain holes... the rubber seal on the metal panel itself isn't a waterproof seal - merely for acoustic purposes. Even if the sunroof sits lower than the actual roof it still shouldn't really leak (water should run into the channel and down the drain holes). Perhaps the surrounding area is full of crap/leaves??

The sunroof drains if you can't clear them from the sunroof end follow the roof back and end up in the C pillars too