Adding some comments + small fixes