Restore math to 2 of 3 common files.
Fixed issues with MathML stuff