fixes corresponding to review feedback at pull request #479