The second in a series of easy themed cryptics to celebrate the Spelly Cat page going live on Steam - Add it to your Steam Wishlist if you like grid-based wordy puzzle games! https://store.steampowered.com/app/2445350/Spelly_Cat/
I don't know if you already changed 11D, but I think it works as COMPOS[-e]+T. I would get rid of the repetition in 1D's surface with the answer to 16D.
Oh thanks - I haven't changed it yet. Just thought 'to head' isn't the best grammar and the charade is a 3-step solve so I'm trying to be nice :)
Great idea on referencing 16D in 1D