cleaning up, added lifted arithmetic operators