Synonym updates and clearer groupings

Reorganised synonym groups by purpose.
Added and removed some synonyms to solve current problems.
Temporarily commented out some synonyms that are useful but need further work to solve, or that may no longer be needed.