Addressing last of reviewer comments.