Uniary + and - can be combined with other factors now

Combination of unary -, + operators wasn't working properly before.
Ameer caught the problem.