fixed some highlighting bugs