done some comments