Fix to use global variable for highlight group
Improve highlight & speed

Including Cosmetic change
Merge branch 'improve/highlight' into master