Using unary negation now. Various other small fixes