I think you're right, peterm, thanks. Unfortunately, all your clever answers have mucked up two I thought I had!
7 down:Shipman ordered a shawl(8), I thought it was mantilla, but now it's .a(?).h.i.a
and
21 Across: hot root? (6) p....t. Could be potato, but why?