Changed some comments and added missing comments