Clarified some terms.
Improved highlit matching and colors.