diff --git a/lapi.c b/lapi.c
index b0f3e52b..84b3fe72 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 1.201 2002/06/20 20:41:46 roberto Exp roberto $
+** $Id: lapi.c,v 1.202 2002/06/24 13:08:45 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -426,7 +426,7 @@ LUA_API void lua_gettable (lua_State *L, int index) {
   const TObject *v;
   lua_lock(L);
   t = luaA_index(L, index);
-  v = luaV_gettable(L, t, L->top-1);
+  v = luaV_gettable(L, t, L->top-1, 0);
   setobj(L->top - 1, v);
   lua_unlock(L);
 }
@@ -597,7 +597,7 @@ LUA_API int lua_setglobals (lua_State *L, int level) {
 ** `load' and `call' functions (run Lua code)
 */
 
-LUA_API void lua_upcall (lua_State *L, int nargs, int nresults) {
+LUA_API void lua_call (lua_State *L, int nargs, int nresults) {
   StkId func;
   lua_lock(L);
   api_checknelems(L, nargs+1);
diff --git a/lbaselib.c b/lbaselib.c
index 85f658db..aeb213b9 100644
--- a/lbaselib.c
+++ b/lbaselib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.84 2002/06/24 17:23:16 roberto Exp roberto $
+** $Id: lbaselib.c,v 1.85 2002/06/25 19:19:33 roberto Exp roberto $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -357,7 +357,7 @@ static int luaB_newproxy (lua_State *L) {
 #endif
 
 #ifndef LUA_PATH_DEFAULT
-#define LUA_PATH_DEFAULT	"?.lua"
+#define LUA_PATH_DEFAULT	"?;?.lua"
 #endif
 
 
@@ -403,7 +403,7 @@ static int luaB_require (lua_State *L) {
   lua_pushvalue(L, 1);
   lua_setglobal(L, "_REQUIREDNAME");
   lua_getglobal(L, REQTAB);
-  if (!lua_istable(L, 2)) return luaL_error(L, REQTAB " is not a table");
+  if (!lua_istable(L, 2)) return luaL_error(L, "`" REQTAB "' is not a table");
   path = getpath(L);
   lua_pushvalue(L, 1);  /* check package's name in book-keeping table */
   lua_rawget(L, 2);
diff --git a/ldo.c b/ldo.c
index 616a8e75..a43a6506 100644
--- a/ldo.c
+++ b/ldo.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.c,v 1.182 2002/06/18 17:42:52 roberto Exp roberto $
+** $Id: ldo.c,v 1.183 2002/06/20 20:41:46 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -283,7 +283,7 @@ void luaD_call (lua_State *L, StkId func, int nResults) {
     firstResult = luaV_execute(L);  /* call it */
     if (firstResult == NULL) {
       luaD_poscall(L, 0, L->top);
-      luaG_runerror(L, "attempt to `yield' across tag-method/C-call boundary");
+      luaG_runerror(L, "attempt to yield across tag-method/C-call boundary");
     }
   }
   luaD_poscall(L, nResults, firstResult);
@@ -357,7 +357,7 @@ LUA_API int lua_yield (lua_State *L, int nresults) {
   lua_lock(L);
   ci = L->ci;
   if (ci_func(ci-1)->c.isC)
-    luaG_runerror(L, "cannot `yield' a C function");
+    luaG_runerror(L, "cannot yield a C function");
   ci->yield_results = nresults;
   lua_unlock(L);
   return -1;
diff --git a/liolib.c b/liolib.c
index f0005e43..d3216a1f 100644
--- a/liolib.c
+++ b/liolib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: liolib.c,v 2.10 2002/06/06 18:17:33 roberto Exp roberto $
+** $Id: liolib.c,v 2.11 2002/06/18 15:16:18 roberto Exp roberto $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
@@ -519,7 +519,7 @@ static int io_date (lua_State *L) {
     if (strftime(b, sizeof(b), s, stm))
       lua_pushstring(L, b);
     else
-      return luaL_error(L, "invalid `date' format");
+      return luaL_error(L, "`date' format too long");
   }
   return 1;
 }
diff --git a/lparser.c b/lparser.c
index 3ceb15e7..181e4284 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lparser.c,v 1.187 2002/06/06 13:52:37 roberto Exp roberto $
+** $Id: lparser.c,v 1.188 2002/06/06 17:29:53 roberto Exp roberto $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
@@ -927,7 +927,7 @@ static void whilestat (LexState *ls, int line) {
   fs->jpc = NO_JUMP;
   sizeexp = fs->pc - expinit;  /* size of expression code */
   if (sizeexp > MAXEXPWHILE) 
-    luaX_syntaxerror(ls, "while condition too complex");
+    luaX_syntaxerror(ls, "`while' condition too complex");
   for (i = 0; i < sizeexp; i++)  /* save `exp' code */
     codeexp[i] = fs->f->code[expinit + i];
   fs->pc = expinit;  /* remove `exp' code */