More changes to comments