[adamlynch]

I've just rewritten this area of the code completely so all of this should be fine now. Thanks again!