diff --git a/globals.zil b/globals.zil
index 8280612..68c20c5 100644
--- a/globals.zil
+++ b/globals.zil
@@ -1340,9 +1340,9 @@ There is no causal relationship between these two events.">
 		<RTRUE>)
 	       (T
 		<MOVE ,PRSO ,LOCAL-GLOBALS>
-		<COND (<EQUAL? ,PRSO ,BROWNIAN-SOURCE>
+		<COND (<PRSO? ,BROWNIAN-SOURCE>
 		       <SETG BROWNIAN-SOURCE <>>)
-		      (<EQUAL? ,PRSO ,PANEL-BLOCKER>
+		      (<PRSO? ,PANEL-BLOCKER>
 		       <SETG PANEL-BLOCKER <>>)>
 		<TELL "It spills all over and then evaporates.">
 		<COND (<PRSO? ,MINERAL-WATER>
@@ -1422,12 +1422,12 @@ of complete happiness and relaxation.">
 	(ACTION NO-TEA-F)>
 
 <ROUTINE NO-TEA-F ()
-	 <COND (<AND <VERB? TAKE DROP>
+	 <COND (<AND <VERB? TAKE PICK-UP DROP>
 		     <PRSO? ,NO-TEA>
 		     <NOT <FSET? ,PARTICLE ,MUNGEDBIT>>>
 		<TELL
 "Your common sense tells you that you can't do that." CR>)
-	       (<AND <VERB? TAKE>
+	       (<AND <VERB? TAKE PICK-UP>
 		     <PRSO? ,NO-TEA>
 		     <NOT ,HOLDING-NO-TEA>>
 		<SETG HOLDING-NO-TEA T>
@@ -1456,7 +1456,7 @@ of complete happiness and relaxation.">
 		       <COND (<HELD? ,TEA>
 			      <RTRUE>)
 			     (<AND ,PRSI
-				   <NOT <EQUAL? ,PRSI <LOC ,PRSO>>>>
+				   <NOT <PRSI? <LOC ,PRSO>>>>
 			      <RTRUE>)
 			     (T
 			      <RFALSE>)>)
diff --git a/heart.zil b/heart.zil
index f529f35..cac5e79 100644
--- a/heart.zil
+++ b/heart.zil
@@ -282,6 +282,7 @@ he goes, \"with this terrible pain in all the diodes down my left side.\"" CR>)
 			       <SETG TOOL-REQUIRED <PICK-ONE ,TOOL-LIST>>
 			       <COND (<NOT <HELD? ,TOOL-REQUIRED ,PROTAGONIST>>
 				      <RETURN>)>>)>
+		       <SETG P-IT-OBJECT ,TOOL-REQUIRED>
 		       <SETG MARVIN-COUNTER 2>
 		       <TELL "Marvin, looking bored, says \"Hand me">
 		       <ARTICLE ,TOOL-REQUIRED>
@@ -1123,7 +1124,7 @@ anywhere in life? But don't read unless there's enough light.\"" CR>)>>
 
 <ROUTINE ZAPHOD-F ()
 	 <COND (<EQUAL? ,IDENTITY-FLAG ,ZAPHOD>
-		<COND (<EQUAL? ,ZAPHOD ,PRSO>
+		<COND (<PRSO? ,ZAPHOD ,PHIL>
 		       <PERFORM ,PRSA ,ME ,PRSI>
 		       <RTRUE>)
 		      (T
@@ -1491,7 +1492,7 @@ The " D ,SALES-BROCHURE " goes on to describe the ship's complement of " ,SCC
 		       <TELL
 "This is the room that houses the powerful In" ,FIG
 " that drives " D ,HEART-OF-GOLD ". An exit lies fore of here." CR>)>)
-	       (<AND <EQUAL? ,RARG ,M-END>
+	       (<AND <EQUAL? .RARG ,M-END>
 		     <EQUAL? ,LOOK-COUNTER 3>>
 		<SETG LOOK-COUNTER 4>
 		<TELL CR "(Footnote 10)" CR>)>>
@@ -1975,4 +1976,4 @@ to find out about." CR CR>
 "By the way, there WAS a causal relationship between your taking the "
 D ,TOOTHBRUSH " and the tree collapsing at the very beginning of the game.
 We apologise for this slight inaccuracy." CR>
-		<QUIT>)>>
\ No newline at end of file
+		<FINISH>)>>
\ No newline at end of file
diff --git a/misc.zil b/misc.zil
index 1c26fb5..70e06c3 100644
--- a/misc.zil
+++ b/misc.zil
@@ -4,8 +4,6 @@
 
 ;"former MACROS.ZIL stuff"
 
-<ZSTR-OFF>
-
 <SETG C-ENABLED? 0>
 
 <SETG C-ENABLED 1>
@@ -163,9 +161,6 @@
 
 <DEFMAC DISABLE ('INT)
 	<FORM PUT .INT ,C-ENABLED? 0>>
-
-<ZSTR-ON>
-
 
 ;"former MAIN.ZIL stuff"
 
diff --git a/s4.errors b/s4.errors
new file mode 100644
index 0000000..2b1cd1e
--- /dev/null
+++ b/s4.errors
@@ -0,0 +1,24 @@
+Assembling S4.XZAP.1 on Thursday, October 2, 1986 22:03:54
+Release: 60
+
+    64	Inserting S4FREQ.XZAP.2	   (634 bytes)
+   698	Inserting S4DAT.ZAP.1	 (19961 bytes)
+ 20659	Inserting MISC.ZAP.1	  (1826 bytes)
+ 22485	Inserting PARSER.ZAP.1	  (6083 bytes)
+ 28568	Inserting SYNTAX.ZAP.1	     (0 bytes)
+ 28568	Inserting VERBS.ZAP.1	 (15191 bytes)
+ 43759	Inserting GLOBALS.ZAP.1	 (14345 bytes)
+ 58104	Inserting EARTH.ZAP.1	 (19174 bytes)
+ 77278	Inserting VOGON.ZAP.1	  (5744 bytes)
+ 83022	Inserting UNEARTH.ZAP.1	  (9740 bytes)
+ 92762	Inserting HEART.ZAP.1	 (13513 bytes)
+106275	Inserting S4STR.ZAP.1	  (7055 bytes)
+220 objects.
+239 globals.
+971 word vocabulary.
+
+113330 bytes (111K).
+ 20453 bytes of preload.
+  9736 bytes of impure.
+
+Outputting symbol tables
diff --git a/s4.xzap b/s4.xzap
new file mode 100644
index 0000000..22bec21
--- /dev/null
+++ b/s4.xzap
@@ -0,0 +1,36 @@
+	.INSERT "S4FREQ"
+
+
+	.INSERT "S4DAT"			; DATA IS IN THIS FILE
+
+
+	.INSERT "MISC"
+
+
+	.INSERT "PARSER"
+
+
+	.INSERT "SYNTAX"
+
+
+	.INSERT "VERBS"
+
+
+	.INSERT "GLOBALS"
+
+
+	.INSERT "EARTH"
+
+
+	.INSERT "VOGON"
+
+
+	.INSERT "UNEARTH"
+
+
+	.INSERT "HEART"
+
+
+	.INSERT "S4STR"
+
+	.END
diff --git a/s4.zil b/s4.zil
index 3a2a227..e7bfdf2 100644
--- a/s4.zil
+++ b/s4.zil
@@ -7,24 +7,13 @@
 
 ">
 
-<BLOAT 90000 0 0 3300 0 0 0 0 0 256>
-
 <SNAME "S4">
 
 <SET REDEFINE T>
 
-<OR <GASSIGNED? ZILCH>
-    <SETG WBREAKS <STRING !\" !,WBREAKS>>>
-
-<OR <GASSIGNED? INSERT-CRUFTY>
+;<OR <GASSIGNED? INSERT-CRUFTY>
     <DEFINE INSERT-CRUFTY (STR) <INSERT-FILE .STR T>>>
 
-<COND (<GASSIGNED? PREDGEN>
-       <ID 0>)>
-
- <COND (<GASSIGNED? PREDGEN>
-	       <SETG ZSTR-ON <SETG ZSTR-OFF ,TIME>>)>
-
 <INSERT-FILE "MISC" T>
 <INSERT-FILE "HEART" T>
 <INSERT-FILE "PARSER" T>
diff --git a/s4.zip b/s4.zip
index a82d712..a581959 100644
Binary files a/s4.zip and b/s4.zip differ
diff --git a/s4freq.xzap b/s4freq.xzap
new file mode 100644
index 0000000..e20d3af
--- /dev/null
+++ b/s4freq.xzap
@@ -0,0 +1,200 @@
+	.FSTR FSTR?1,"the "	;1664	832
+	.FSTR FSTR?2,", "	;842	842
+	.FSTR FSTR?3,"You "	;810	270
+	.FSTR FSTR?4,"you "	;736	368
+	.FSTR FSTR?5,"and "	;736	368
+	.FSTR FSTR?6,"The "	;702	234
+	.FSTR FSTR?7,". "	;529	529
+	.FSTR FSTR?8,"your "	;513	171
+	.FSTR FSTR?9,"that "	;459	153
+	.FSTR FSTR?10,"of "	;406	406
+	.FSTR FSTR?11,"is "	;370	370
+	.FSTR FSTR?12,"to "	;368	368
+	.FSTR FSTR?13,"can't "	;350	70
+	.FSTR FSTR?14,"with "	;303	101
+	.FSTR FSTR?15,"have "	;246	82
+	.FSTR FSTR?16,"are "	;240	120
+	.FSTR FSTR?17,"from "	;237	79
+	.FSTR FSTR?18,"about "	;212	53
+	.FSTR FSTR?19,"in "	;209	209
+	.FSTR FSTR?20,"for "	;202	101
+	.FSTR FSTR?21,"There "	;190	38
+	.FSTR FSTR?22,"which "	;188	47
+	.FSTR FSTR?23,"already "	;180	30
+	.FSTR FSTR?24,"this "	;177	59
+	.FSTR FSTR?25,"something "	;168	21
+	.FSTR FSTR?26,"It "	;166	83
+	.FSTR FSTR?27,"through "	;162	27
+	.FSTR FSTR?28,"This "	;156	39
+	.FSTR FSTR?29,"nothing "	;150	25
+	.FSTR FSTR?30,"Prosser "	;147	21
+	.FSTR FSTR?31,"It's "	;145	29
+	.FSTR FSTR?32,"Ford "	;144	36
+	.FSTR FSTR?33,"don't "	;140	28
+	.FSTR FSTR?34,"Arthur "	;138	23
+	.FSTR FSTR?35,"There's "	;136	17
+	.FSTR FSTR?36,"around "	;135	27
+	.FSTR FSTR?37,"You're "	;133	19
+	.FSTR FSTR?38,"Beast "	;130	26
+	.FSTR FSTR?39,"into "	;126	42
+	.FSTR FSTR?40,"like "	;120	40
+	.FSTR FSTR?41,"it "	;113	113
+	.FSTR FSTR?42,"doesn't "	;112	16
+	.FSTR FSTR?43,"Footnote "	;112	14
+	.FSTR FSTR?44,"but "	;108	54
+	.FSTR FSTR?45,"you're "	;108	18
+	.FSTR FSTR?46,"small "	;104	26
+	.FSTR FSTR?47,"on "	;102	102
+	.FSTR FSTR?48,"will "	;102	34
+	.FSTR FSTR?49,"just "	;102	34
+	.FSTR FSTR?50,"because "	;102	17
+	.FSTR FSTR?51,"see "	;96	48
+	.FSTR FSTR?52,"has "	;96	48
+	.FSTR FSTR?53,"not "	;94	47
+	.FSTR FSTR?54,"seems "	;92	23
+	.FSTR FSTR?55,"it's "	;92	23
+	.FSTR FSTR?56,"Improbability "	;91	7
+	.FSTR FSTR?57,"toward "	;90	18
+	.FSTR FSTR?58,"you've "	;90	15
+	.FSTR FSTR?59,"what "	;87	29
+	.FSTR FSTR?60,"says "	;87	29
+	.FSTR FSTR?61,"at "	;86	86
+	.FSTR FSTR?62,"here"	;84	42
+	.FSTR FSTR?63,"very "	;84	28
+	.FSTR FSTR?64,"looks "	;84	21
+	.FSTR FSTR?65,"probably "	;84	12
+	.FSTR FSTR?66,"you"	;83	83
+	.FSTR FSTR?67,"can "	;82	41
+	.FSTR FSTR?68,"all "	;80	40
+	.FSTR FSTR?69,"out "	;78	39
+	.FSTR FSTR?70,"anything "	;77	11
+	.FSTR FSTR?71,"think "	;76	19
+	.FSTR FSTR?72,"closed"	;76	19
+	.FSTR FSTR?73,"isn't "	;75	15
+	.FSTR FSTR?74,"his "	;74	37
+	.FSTR FSTR?75,"I "	;72	72
+	.FSTR FSTR?76,"down "	;72	24
+	.FSTR FSTR?77,"would "	;72	18
+	.FSTR FSTR?78,"their "	;72	18
+	.FSTR FSTR?79,"large "	;72	18
+	.FSTR FSTR?80,"front "	;72	18
+	.FSTR FSTR?81,"I'm "	;72	18
+	.FSTR FSTR?82,"Unfortunately"	;72	6
+	.FSTR FSTR?83,"be "	;70	70
+	.FSTR FSTR?84,"little "	;70	14
+	.FSTR FSTR?85,"Arthur"	;70	14
+	.FSTR FSTR?86,"even "	;69	23
+	.FSTR FSTR?87,"He "	;66	33
+	.FSTR FSTR?88,"some "	;66	22
+	.FSTR FSTR?89,"Ford"	;66	22
+	.FSTR FSTR?90,"holding "	;66	11
+	.FSTR FSTR?91,"between "	;66	11
+	.FSTR FSTR?92,"anything"	;66	11
+	.FSTR FSTR?93,"across "	;65	13
+	.FSTR FSTR?94,"going "	;64	16
+	.FSTR FSTR?95,"currently "	;64	8
+	.FSTR FSTR?96,"something"	;63	9
+
+
+;word frequency table of 96 most common words
+
+WORDS::	.TABLE
+	FSTR?1
+	FSTR?2
+	FSTR?3
+	FSTR?4
+	FSTR?5
+	FSTR?6
+	FSTR?7
+	FSTR?8
+	FSTR?9
+	FSTR?10
+	FSTR?11
+	FSTR?12
+	FSTR?13
+	FSTR?14
+	FSTR?15
+	FSTR?16
+	FSTR?17
+	FSTR?18
+	FSTR?19
+	FSTR?20
+	FSTR?21
+	FSTR?22
+	FSTR?23
+	FSTR?24
+	FSTR?25
+	FSTR?26
+	FSTR?27
+	FSTR?28
+	FSTR?29
+	FSTR?30
+	FSTR?31
+	FSTR?32
+	FSTR?33
+	FSTR?34
+	FSTR?35
+	FSTR?36
+	FSTR?37
+	FSTR?38
+	FSTR?39
+	FSTR?40
+	FSTR?41
+	FSTR?42
+	FSTR?43
+	FSTR?44
+	FSTR?45
+	FSTR?46
+	FSTR?47
+	FSTR?48
+	FSTR?49
+	FSTR?50
+	FSTR?51
+	FSTR?52
+	FSTR?53
+	FSTR?54
+	FSTR?55
+	FSTR?56
+	FSTR?57
+	FSTR?58
+	FSTR?59
+	FSTR?60
+	FSTR?61
+	FSTR?62
+	FSTR?63
+	FSTR?64
+	FSTR?65
+	FSTR?66
+	FSTR?67
+	FSTR?68
+	FSTR?69
+	FSTR?70
+	FSTR?71
+	FSTR?72
+	FSTR?73
+	FSTR?74
+	FSTR?75
+	FSTR?76
+	FSTR?77
+	FSTR?78
+	FSTR?79
+	FSTR?80
+	FSTR?81
+	FSTR?82
+	FSTR?83
+	FSTR?84
+	FSTR?85
+	FSTR?86
+	FSTR?87
+	FSTR?88
+	FSTR?89
+	FSTR?90
+	FSTR?91
+	FSTR?92
+	FSTR?93
+	FSTR?94
+	FSTR?95
+	FSTR?96
+	.ENDT
+
+	.ENDI
diff --git a/syntax.zil b/syntax.zil
index 260e0fa..dbab7d7 100644
--- a/syntax.zil
+++ b/syntax.zil
@@ -2,7 +2,7 @@
 		  THE HITCHHIKER'S GUIDE TO THE GALAXY
 	(c) Copyright 1984 Infocom, Inc.  All Rights Reserved."
 
-<BUZZ A AN THE IS ARE AM AND OF THEN ALL ONE BUT EXCEPT \. \, \"
+<BUZZ A AN THE IS ARE AM AND OF THEN ALL BUT EXCEPT \. \, \"
       DON\'T DONT PRY PLEASE HERE SOME MORE FRONT>
 
 <SYNONYM TO TOWARD>
diff --git a/unearth.zil b/unearth.zil
index 3dc13a5..8bb892b 100644
--- a/unearth.zil
+++ b/unearth.zil
@@ -475,7 +475,7 @@ The creature stirred in its sickly broiling vapour, and at that very moment
 the words \"">
 	 <RESTORE-INPUT ,FIRST-BUFFER>
 	 <TELL "\" drifted across the conference table.
-Unfortunately, in the Vl'hurg tongue this was the most dreadful insult
+Unfortunately, in the Vl'Hurg tongue this was the most dreadful insult
 imaginable, and there was nothing for it but to wage terrible war for
 centuries. Eventually the error was detected, but over two hundred and
 fifty thousand worlds, their peoples and cultures perished in the holocaust.|
@@ -719,7 +719,7 @@ to be some faint markings on it.")
 		<FSET ,WAR-CHAMBER ,REVISITBIT>
 		<TELL "As you remove the " D ,PARTICLE>
 		<JIGS-UP
-" electrical impulses begin leaping madly across the now-unblocked synaptic
+", electrical impulses begin leaping madly across the now-unblocked synaptic
 gap. Unfortunately, YOU were in the gap at the time.">
 		<RTRUE>)
 	       (<VERB? EXAMINE READ>
diff --git a/verbs.zil b/verbs.zil
index 4d96324..6e51bcd 100644
--- a/verbs.zil
+++ b/verbs.zil
@@ -1079,12 +1079,12 @@ relax a little." CR>>
 		       <TELL "." CR>)>)
 	       (<FSET? ,PRSO ,DOORBIT>
 		<TELL "All you can tell is that">
+		<ARTICLE ,PRSO T>
+		<TELL " is ">
 		<COND (<FSET? ,PRSO ,OPENBIT>
-		       <ARTICLE ,PRSO T>
-		       <TELL " is open.">)
+		       <TELL "open.">)
 		      (T
-		       <ARTICLE ,PRSO T>
-		       <TELL " is closed.">)>
+		       <TELL "closed.">)>
 		<CRLF>)
 	       (<FSET? ,PRSO ,CONTBIT>
 		<COND (<PRSO? <LOC ,WINNER>>
@@ -1793,7 +1793,7 @@ D ,DISPENSER-BUTTON " from there." ,GETTING-CLOSE CR>)
 		<PERFORM ,V?REMOVE ,PRSO>
 		<RTRUE>)
 	       (<AND <FSET? ,PRSO ,INTEGRALBIT>
-		     <EQUAL? ,PRSI <LOC ,PRSO>>>
+		     <PRSI? <LOC ,PRSO>>>
 		<RFALSE>)
 	       (<OR <IN? ,PRSO ,PROTAGONIST>
 		    <AND <HELD? ,PRSO>
@@ -1803,8 +1803,8 @@ D ,DISPENSER-BUTTON " from there." ,GETTING-CLOSE CR>)
 		      (T
 		       <TELL "You already have it." CR>)>)
 	       (,PRSI
-		<COND (<PRSO? ,ME>
-		       <PERFORM ,V?DROP ,PRSI>
+		<COND (<PRSI? ,ME>
+		       <PERFORM ,V?DROP ,PRSO>
 		       <RTRUE>)
 		      (<AND <PRSO? ,ITEM-ON-SATCHEL>
 			    <PRSI? ,SATCHEL>>
diff --git a/vogon.zil b/vogon.zil
index 329e97a..d0f9351 100644
--- a/vogon.zil
+++ b/vogon.zil
@@ -44,6 +44,7 @@ imagine what kind of beach communities they have.)" CR>)
 		<FSET ,PEANUTS ,TAKEBIT>
 		<FCLEAR ,PEANUTS ,NDESCBIT>
 		<FCLEAR ,PEANUTS ,TRYTAKEBIT>
+		<FCLEAR ,TOWEL ,TRYTAKEBIT>
 		<MOVE ,PEANUTS ,PROTAGONIST>
 		<MOVE ,FORD ,HERE>
 		<MOVE ,MINERAL-WATER ,FORD>
@@ -238,7 +239,8 @@ a " D ,ROBOT-PANEL " at the base of the wall. ">
 			       <MOVE ,BABEL-FISH ,PROTAGONIST>
 			       <COND (<RUNNING? ,I-ANNOUNCEMENT>
 				      <ENABLE <QUEUE I-GUARDS 4>>)
-				     (T
+				     (<NOT
+				       <FSET? ,CAPTAINS-QUARTERS ,TOUCHBIT>>
 				      <ENABLE <QUEUE I-ANNOUNCEMENT 4>>
 				      <ENABLE <QUEUE I-GUARDS 7>>)>
 			       <SETG FISH-COUNTER 0>