a few changes in comments