Added subtract and multiply.  Refactored binary ops a bit.