Worked on making highlighting better.