Math highlight

Made a bunch of math highlighting improvments. Feel free to pull them.

GI