Added comments + small fixes/improvements