Math highlight

I made a bunch of improvements to your math-highlight branch. Feel free to pull them.

GI