ExpressionParser, Expression fixes, improvements