fix comments from @ninniuz