I'm not sure what it was... but now it is working fine :D
The hot water comes on without the CH pipe getting hot, havent tried the CH yet. Hopefully it will work too.
It still makes some weird noises, but at least I can have a shower!
Cheers for you advice, I think next time I will...