I've received word from WILL about my latest fixes, but it seemed he made changes too which conflicted with mine.

I'll have another look at it this weekend.