Modify and fix comments problems