Great. Thanks for the advice. I'll give that a go on the headliner. Sounds like that will do the trick and shouldnt be too complicated.

As for the carpet I've just checked it and you're right. It feels dry to the touch but push down and you can feel the damp underneath. Sounds like a job for the weekend!

Thanks again!