Some small fixes + the begining of expression evaluation