Finally completed one in under a day! Sorted all the messages and made the change to the hidden word. Just two minor ??s - 7d - there's only really one word it can be, just not sure why. Ditto 21d...I can't parse the 'No divided French etc' but there's only one likely answer that fits the NZ bit (I think!).