Yes, jbird54 - shortened versions and abbreviations (eg 20a) for words given in the anagram fodder should remain intact and in place, not spread around (I think).
I'm not keen on the anagram indicator at 6d - not sure Chambers justifies it (or the definition at 33d - that would be 2 words, I think).
I have a few more quibbles, but they're just that (and I think it's an enjoyable, well constructed puzzle for all that).