Yes alwayspuzzled, you are correct in your assumption.
I've finished the grid except for 29a: 'Group of Highlanders shortly to take on drink' (assuming the 'in' becomes 'on' from the original clue). I have CO??. The last letter may or may not be T. Any help gratefully received!
I also have filled in a few answers I couldn't parse but hey ho...