So (conveniently) while I was away with work, this car decided to die again...with some fire though. Car is not burned to the ground, just the wire that goes on the back of the alternator decided to separate from the terminal and spark and flames came from the alternator (I am pretty sure it was just sparks, we all know how overly excited people can exaggerate things, although the wire casing is missing for about 2").
Looked at it tonight, and replaced the wire (need to replace my soldering iron so I can do the job properly

) and when I took the nut off the back it snapped the bolt in the back, so I need to replace the alternator tomorrow. I will see if I can replace the bolt/thread in the back of the alternator and have it as a spare just in case.
*EDIT* I also need to do something about the tensioner, as the lower part is rubbing on the belt. Might have to find out what other people have done and see how I can fix it. I think it just needs to be spaced out a bit and go from there. What have other people done with an AU engine and XH tensioner?