Math symbol re-arrangement.
trivial bug fixes.