Fixing some of the comments