adapt some comments