many fixes, mostly in expressions