LUN-1070 -- added comments + last changes