Added todo-list, refined merge in simplify, added unary minus to Values.