spacing
spacing
spacing
fix bug in match highlighting