All done and endgame complete, but struggling still with 16a. Only missing the letter that goes in the unched cell, which I've assumed reasonably confidently based on the likely matching definition, but a nudge as to the parsing would be appreciated.
Lovely puzzle