--- gforth/search.fs	1997/07/06 15:55:25	1.2
+++ gforth/search.fs	1998/10/10 10:28:35	1.5
@@ -38,7 +38,7 @@ Variable slowvoc   0 slowvoc !
 
 : mappedwordlist ( map-struct -- wid )	\ gforth
 \G creates a wordlist with a special map-structure
-  here 0 A, swap A, voclink @ A, 0 A,
+  here swap A, 0 A, voclink @ A, 0 A,
   dup wordlist-link voclink !
   dup initvoc ;
 
@@ -105,11 +105,11 @@ slowvoc off
 Vocabulary Forth
 Vocabulary Root
 
-: Only  0 vp! also Root also definitions ;
+: Only  1 vp! Root also ;
 
 \ set initial search order                             14may93py
 
-Forth-wordlist @ ' Forth >body !
+Forth-wordlist wordlist-id @ ' Forth >body wordlist-id !
 
 0 vp! also Root also definitions
 Only Forth also definitions
@@ -130,7 +130,7 @@ lookup ! \ our dictionary search order b
 : seal ( -- )  context @ 1 set-order ;
 
 : .voc
-    body> >head head>string type space ;
+    body> >head name>string type space ;
 
 : order ( -- )  \  search-ext
     \g prints the search order and the @code{current} wordlist.  The