Now expression is a statement
Some fixes