Hi Richard, thanks for stepping in. I had my nephews stay last night (apparently there was some rave nearby - these crazy kids!).
Agree it was an excellent crossword, and again, as is usual with this setter, the first and last clues rhymed.
Like you, my COD is 24d, absolutely inspired.