some comments modified