Index: toltcl/generic/toltcl.c
===================================================================
--- toltcl/generic/toltcl.c	(revision a58f1e9401a30e4b0dd03f123cce2b3b15065a30)
+++ toltcl/generic/toltcl.c	(revision 85934974b19ef3e045376f502cc5107f4a9e32a4)
@@ -215,9 +215,24 @@
     return TCL_ERROR;
   }
-  lang = (objc == 1 || !strcasecmp("es", Tcl_GetString(objv[1])));
-  vmode = objc == 3 ? Tcl_GetString(objv[2]) :  NULL;
+  if ( objc >= 2 ) {
+    if ( !strcasecmp("es", Tcl_GetString( objv[1] ) ) ) {
+      lang = 1;
+    } else if ( !strcasecmp("en", Tcl_GetString( objv[1] ) ) ) {
+      lang = 0;
+    } else {
+      lang = -1;
+    }
+    if ( objc == 3 ) {
+      vmode = Tcl_GetString( objv[2] );
+    } else {
+      vmode = NULL;
+    }
+  } else {
+    lang = -1;
+    vmode = NULL;
+  }
 
   if ( !TOLHasBeenInitialized( ) ) {
-    //printf( "TOL no esta inicializado\n" );
+    /* printf( "****TOL no esta inicializado %d****\n", lang ); */
     /*
      * Initialize kernel
@@ -232,5 +247,5 @@
     Tol_gsl_set_error_handler(&TT_gsl_error_handler);
   } else {
-    //printf( "TOL esta inicializado\n" );
+    /* printf( "****TOL esta inicializado****\n" ); */
   }
   
@@ -953,10 +968,9 @@
       }
     } else if (!strncasecmp("reference", arg, length)) {
-//      if (objc > 4 || objc < 3) {
+      /* if (objc > 4 || objc < 3) { */
       if (objc != 3) {
         Tcl_AppendStringsToObj(obj_result,
                                "wrong # args: should be '",
                                Tcl_GetString(objv[0]),
-//                               " reference ?grammar? obj'",
                                " reference {grammar|container objname ?indexes?}'",
                                NULL);
@@ -1234,5 +1248,4 @@
      Tcl_Obj * obj_result;
 {
-//  if ( objc < 2 || objc > 3 ) {
   if ( objc != 2 ) {
     Tcl_AppendStringsToObj(obj_result,
@@ -1243,6 +1256,4 @@
     return TCL_ERROR;
   }
-//  return  objc == 2 ? Tol_SetVariablesObj(interp, objv[1], obj_result) :
-//    Tol_SetVariableInfoObj(objv[1], objv[2], obj_result);
   return  Tol_SetVariablesObj(interp, objv[1], obj_result);
 }
@@ -1586,5 +1597,4 @@
    */
   
-  //InitTolKernel();
   if ( !TOLHasBeenInitialized( ) ) {
     Tol_InstallHciWriter();