Fix/add some comments