address all the comments