I have just completed the grid. I found this one very difficult compared with some of the latest ones. I do not think that it is necessary to highlight parts of the 18 treated answers.
12 across is still irritating me. I have the goddess but cannot work out the subsidiary part of the clue. Keep persevering, Anniec.
It will be worthwhile when it all fits together.