fix comments bugs