implement changes requested in pull request line notes.

i think that's all of them...