some changes in comments