added and changed comments