Highlight updating logic improved, hightlight matched at last.
Removed some useful 'unlet' lines.