Minor optimization.
Work on highlighting.