Good morning Mondrian
Your reasoning on 15A is exactly right!
re 24A. Charlotte's post 14 is very good.
The alternative sword for a horse, would be the one used by a Knight (on his trusty *****) + e (for electronic) and a 3-letter word for a place where sheep would be held.
Is that even more confusing ?!
All the best
Jazzgirl