Some changes to comments