ref #47, tweaks based on review