Cheers Kaz, I'll make the changes. There's still quite a few TODO's in that code that I intend on fixing up at some point.