more comments edited