Add some comments plus fix a possible mem leak