All done now thanks to your help. Sloppy editing again!
A couple I've only partly parsed - any more clarification, please?
13 Someone permanently into his work, good he likes to party (11)
The word play is fine, but I don't see why the definition is "Someone permanently into his work"
2 Scale a scale, short of the bitter end (6)
I see the definition for this one, but not the wordplay