A fun one today after a couple of fairly hellish weeks. Getting the final extra word first and then glancing up a couple of entries with my thinking cap on made the medicine go down real smooth.
Not really sure on the parsing for 16A but there's only one thing it can be so happy to bang it in and leave it there!