I too was stuck on top right corner. I still have 6d to get.
Extra bits in box, belt and buckle finally hauled up.(5, 5)
I have ?P?R? P?R??
My other last one is 22ac Cake gone - and most of the whiskey (6) I have P???M?. I'm not sure about the M.
I'm hoping to finish before Spiral at 9.00pm
Having deleted the wrong M, I had no trouble solving 22ac, but then had difficulty with 18d. In the end I found I'd got 24ac wrong. Putting that right meant correcting 24d.
I've now finished. Whew