Adding allocation to expr, fixing general issues.