Thanks for the photos Shad, I was just about to order a heater from CC this morning, I'll hold off until I've fully dismantled mine, which I expect will be this evening. Not sure how I'm going to dea with the fact that the heater box is falling to bits though, I'll post some photos tonight.
On another note, I like the irony that yours has a sticker with "LEAK TESTED" written on it. "Yep, we've tested it, it leaks".
Chris
S7UPL (it's a SUPerLight 7...)