Enjoyed that. Lots of clever connections.
One last niggle, I have the answer to 22, but the only reference to the first part I can think of is Scottish, which clearly must be wrong. Hint appreciated. (Chris, for a while I thought it might have been your WPR word from last weekend, but not to be)