diff --git a/lopcodes.h b/lopcodes.h
index ee0f9354..591ff7f4 100644
--- a/lopcodes.h
+++ b/lopcodes.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.h,v 1.14 1997/12/30 19:08:23 roberto Exp roberto $
+** $Id: lopcodes.h,v 1.16 1998/03/10 17:15:05 roberto Exp $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -119,9 +119,9 @@ SETTABLE0,/*	-	v i t		-		t[i]=v  */
 
 SETTABLE,/*	b	v a_b...a_1 i t	a_b...a_1 i t	t[i]=v  */
 
-SETLIST,/*	b c	v_b...v_1 t	-		t[i+c*FPF]=v_i  */
+SETLIST,/*	b c	v_c...v_1 t	-		t[i+b*FPF]=v_i  */
 SETLIST0,/*	b	v_b...v_1 t	-		t[i]=v_i  */
-SETLISTW,/*	w c	v_b...v_1 t	-		t[i+c*FPF]=v_i  */
+SETLISTW,/*	w c	v_c...v_1 t	-		t[i+w*FPF]=v_i  */
 
 SETMAP,/*	b	v_b k_b ...v_0 k_0 t	t	t[k_i]=v_i  */
 SETMAP0,/*	-	v_0 k_0 t		t	t[k_0]=v_0  */
diff --git a/ltm.c b/ltm.c
index af332f04..724fee76 100644
--- a/ltm.c
+++ b/ltm.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ltm.c,v 1.13 1998/01/02 17:46:32 roberto Exp roberto $
+** $Id: ltm.c,v 1.14 1998/03/09 21:49:52 roberto Exp roberto $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
@@ -148,7 +148,7 @@ void luaT_settagmethod (int t, char *event, TObject *func)
   int e = luaI_checkevent(event, luaT_eventname);
   checktag(t);
   if (!validevent(t, e))
-    luaL_verror("settagmethod: cannot change internal method `%.20s' for tag %d",
+    luaL_verror("settagmethod: cannot change tag method `%.20s' for tag %d",
                 luaT_eventname[e], t);
   *func = *luaT_getim(t,e);
   *luaT_getim(t, e) = temp;
diff --git a/lvm.c b/lvm.c
index 3bb8d921..2b1622d1 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.c,v 1.24 1998/03/06 16:54:42 roberto Exp roberto $
+** $Id: lvm.c,v 1.25 1998/03/09 21:49:52 roberto Exp roberto $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -136,9 +136,9 @@ void luaV_gettable (void)
 
 /*
 ** Function to store indexed based on values at the stack.top
-** mode = 0: raw store (without internal methods)
-** mode = 1: normal store (with internal methods)
-** mode = 2: "deep L->stack.stack" store (with internal methods)
+** mode = 0: raw store (without tag methods)
+** mode = 1: normal store (with tag methods)
+** mode = 2: "deep L->stack.stack" store (with tag methods)
 */
 void luaV_settable (TObject *t, int mode)
 {