Fix/improve some comments