fixed small highlighting bugs