revision to fix terms w/o a root and class/instance issues in arguments

[jenniech]

Dear Adam,

Please help to review the attached changes and let me know if any correction need before you merge them with main.

Jennie