A few updates to address comments.