incorporate more feedback from drewfish/2 pull request