chg: dev: more work for gh-211 gh-218