Some small changes in commenting!