changed some comments and commenting/uncommenting