Thanks Dylan, I thought so.
22 - extra word. Wordplay = first 3 words of clue.
Vineyards synonym + 1 letter.
30Ac - def = first 2 words. Next 7 words = 8-letter grid entry. Final 5 words of clue = full wordplay. (A 3 letter word/prefix for inferior, followed by a type of ‘electronic’ street dance + i)