Merge pull request #266 from dalehenrich/dev

merge fixes accumulated during run-up to ESUG plus those collected at ESUG