Fix/377/add comments for real