Fixed.

Lemmie know how you go. I still haven't found the time or effort to do it yet.