Improved graph combining, bugs in sum/subtraction solved