fix a highlight bug and add two new samples