change and add some comments