fixed order of operations bug in subtraction : introduced in unary operator removal
fixed order of operations bug in subtraction : introduced in unary operator removal ... moved #define variables to the header file