many fixes with expressions