Changed some more comments