Update #5.5.2

- expression improvements