fix the items that nlf pointed out