minor tweaks based upon A/M comments