Added math operations.

Still does not check for min of 2 operands.
fixed merge conflict.