Cross-reference synonyms
Updated grammar expansion flow

Not compiling yet. Early commit on John's request.