fixes #87 fixes #92

Blodgett, David L. requested to merge dblodgett/gfv2.0:main into main Aug 16, 2022