Changed some of the comments