Add cursor highlighting.
Clarify some variable.