minor tweaks in answer to comments to PR