Thanks mate, it was, but I changed it to a round one with a lower watt rating, the square one was running around near the 70-80 watt range, so you now, the system was up to the task, now i'm running a 30 or 35 watt headlight and things seem much smoother.
The pipes are in an ok condition, the far right one has some road rash, and the others seem to have plastic melted on or something like that, but for now the plan's to get running in tip-top condition and then doing aesthetics to it.
As you can see, it wasn't very oil tight or for that matter brake fluid tight. But now it sort of is, the master cylinder just needed a new gasket for the cap, and on the oil side, I used one of those additives that softens up old dry gaskets, I haven't ridden it that much as for the thing to work correctly but for now, it seems to be working, at least the leak is a lot smaller.