add and remoe some comments