Respond to diff comments: mostly more doc and test