Addressing some suggestions