fix comments issues