fixes from review comments

this was supposed to have been part of the previous PR.  I neglected to push the changes based on review comments before I merged the previous PR.