24d. is WHALE.
30a. A circular part or ornament in jewellery(7) is R-N-E-. Is it RINGER?
Also, 18d. I suppose is STROUPOCH, for a drink of tea. The Gaelic original is STRUPAG, which becomes STRUPACH in Scots. I've never seen it spelt like this before.