Thank you Brendan. Those two did indeed do the trick. All filled in now.
Only 16a that I can’t parse. I have a word that means serenity but can’t see the word play.
Very enjoyable puzzle. Some easy, some challenging and on the whole pretty much on my wavelength.