SimpleExpressionField improvements + big fixes