Finished but a struggle. Very rewarding by the end.
Only one small issue that I cannot resolve. I need an "i" as the extra letter from 21 down. I have an answer that does not seem to need an extra letter to be omitted (a word meaning bum and display). I am sure the word in the grid is correct as I need the circled last letter to spell the questioner and the other letters fit.
Can anyone explain?