Added some comments + small fix