Looks like I had #15 and #21 wrong.
I had:
NOMAD monad = 15. Today's phones? (cell)
and
TRAMS marts = 21. Kardashian's e ........ (guess at "e-marts")
And it should have been:
NOMAD damon = 21. Kardashian's ex
TRAMS smart = 15. Today's phones?
heart = 1. Body organ
idyll = 2. Pastoral poem
shade = 3. Below a tree
traps = 4. Sink necessities
ought = 5. Should
ravel = 6. Tangle
Yemen = 7. Gulf of Aden country
inert = 8. Unable
Salem = 9. Oregon's capital
finer = 10. Less coarse
Astor = 11. John Jacob _____
bugle = 12. Trumpet device
lemon = 13. Defective auto
eaved = 14. Steep-_____ roof
smart = 15. Today's phones?
atone = 16. Make amends
green = 17. Not ripe
roped = 18. Fastened with a rope
erect = 19. Build
Ernie = 20. Burt and _____
damon = 21. Kardashian's ex
Unser = 22. Former race driver
petal = 23. Flower part
ovals = 24. Egg shaped ...........
named = 25. Called
History is fables agreed upon