a few change in comments