address review comments by @twpayne