Thanks to both of you. That has moved me on a fair bit. I now only need 23d (4) 'Upset, not following regulation'. I've got r-p-.
I'm not too sure about the 'p' - it comes from 25a (4,4) 'Those not paying to dance, penned in handwriting' for which I've put 'free pass'.