Addressing some more comments