Added some more simplification, subtraction works ok for most cases