add and remove some comments