fix friggin expression simplifier