diff --git a/Makefile b/Makefile
index 6b133a1..9cae1cf 100644
--- a/Makefile
+++ b/Makefile
@@ -163,6 +163,7 @@ test-limehouse-walkthrough:
 	@lua5.4 run-zil-test.lua books/limehouse-killings/test/test-report-regressions
 	@lua5.4 run-zil-test.lua books/limehouse-killings/test/test-prose-reveal
 	@lua5.4 tests/test_limehouse_walkthrough.lua
+	@lua5.4 tests/test_limehouse_companion.lua
 
 test-wondertown-descriptions:
 	@echo "Running Wondertown description ownership regressions..."
diff --git a/infocom/zork1/test/test-assertions.zil b/infocom/zork1/test/test-assertions.zil
index b37b328..ffe74bb 100644
--- a/infocom/zork1/test/test-assertions.zil
+++ b/infocom/zork1/test/test-assertions.zil
@@ -22,6 +22,8 @@
     <ASSERT "Go to reception room" <CO-RESUME ,CO "west" T> <==? ,HERE ,RECEPTION-ROOM>>
     
     ;"Take the key"
+    ;"The key lies under the reception papers until they are searched."
+    <ASSERT-TEXT "brass key" <CO-RESUME ,CO "search papers">>
     <ASSERT "Take brass key" <CO-RESUME ,CO "take key" T> <==? <LOC ,BRASS-KEY> ,ADVENTURER>>
     
     ;"Check drawer is NOT open yet (should pass)"
diff --git a/infocom/zork1/test/test-check-commands.zil b/infocom/zork1/test/test-check-commands.zil
index c25344a..65759cc 100644
--- a/infocom/zork1/test/test-check-commands.zil
+++ b/infocom/zork1/test/test-check-commands.zil
@@ -25,6 +25,8 @@
     <ASSERT "Drawer is NOT open initially" <NOT <FSET? ,BOTTOM-DRAWER ,OPENBIT>>>
     
     ;"Take the key"
+    ;"The key lies under the reception papers until they are searched."
+    <ASSERT-TEXT "brass key" <CO-RESUME ,CO "search papers">>
     <ASSERT "Take brass key" <CO-RESUME ,CO "take key" T> <==? <LOC ,BRASS-KEY> ,ADVENTURER>>
     
     ;"Unlock and open drawer - the unlock command both unlocks AND opens it"
diff --git a/infocom/zork1/test/test-walk-around-house.zil b/infocom/zork1/test/test-walk-around-house.zil
index f97ca79..74ce378 100644
--- a/infocom/zork1/test/test-walk-around-house.zil
+++ b/infocom/zork1/test/test-walk-around-house.zil
@@ -3,5 +3,5 @@
 <GLOBAL CO <CO-CREATE GO>>
 
 <ROUTINE RUN-TEST ()
-    <ASSERT-TEXT "North of House" <CO-RESUME ,CO "walk around the house">>
+    <ASSERT "Reach North of House" <CO-RESUME ,CO "walk around the house" T> <==? ,HERE ,NORTH-OF-HOUSE>>
     <TELL CR "Forward ACTION routine regression completed!" CR>>
diff --git a/infocom/zork1/test/zork1-walkthrough.zil b/infocom/zork1/test/zork1-walkthrough.zil
index 07c6b64..3972af0 100644
--- a/infocom/zork1/test/zork1-walkthrough.zil
+++ b/infocom/zork1/test/zork1-walkthrough.zil
@@ -14,8 +14,8 @@
     <ASSERT-TEXT "Opening the small mailbox reveals a leaflet." <CO-RESUME ,CO "open mailbox">>
     <ASSERT-TEXT "(Taken)" <CO-RESUME ,CO "read leaflet">>
     <ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop leaflet">>
-    <ASSERT-TEXT "South of House" <CO-RESUME ,CO "walk south">>
-    <ASSERT-TEXT "Behind House" <CO-RESUME ,CO "walk east">>
+    <ASSERT "Reach South of House" <CO-RESUME ,CO "walk south" T> <==? ,HERE ,SOUTH-OF-HOUSE>>
+    <ASSERT "Reach Behind House" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,EAST-OF-HOUSE>>
     <ASSERT-TEXT "With great effort, you open the window far enough to allow entry." <CO-RESUME ,CO "open window">>
     <ASSERT-TEXT "Kitchen" <CO-RESUME ,CO "enter house">>
     <ASSERT-TEXT "Living Room" <CO-RESUME ,CO "walk west">>
@@ -24,7 +24,7 @@
     <ASSERT-TEXT "The door reluctantly opens to reveal a rickety staircase descending into darkness." <CO-RESUME ,CO "open trap door">>
     <ASSERT-TEXT "The brass lantern is now on." <CO-RESUME ,CO "turn on lamp">>
     <ASSERT-TEXT "The trap door crashes shut, and you hear someone barring it." <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "East of Chasm" <CO-RESUME ,CO "walk south">>
+    <ASSERT "Reach East of Chasm" <CO-RESUME ,CO "walk south" T> <==? ,HERE ,EAST-OF-CHASM>>
     <ASSERT-TEXT "Gallery" <CO-RESUME ,CO "walk east">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take painting">>
     <ASSERT-TEXT "Studio" <CO-RESUME ,CO "walk north">>
@@ -40,7 +40,7 @@
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take sword">>
     <ASSERT-TEXT "The door reluctantly opens to reveal a rickety staircase descending into darkness." <CO-RESUME ,CO "open trap door">>
     <ASSERT-TEXT "The trap door crashes shut, and you hear someone barring it." <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "The Troll Room" <CO-RESUME ,CO "walk north">>
+    <ASSERT "Reach The Troll Room" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,TROLL-ROOM>>
     <ASSERT "You are still recovering from that last blow, so your attack is ineffective." <CO-RESUME ,CO "kill troll with sword">>
     <ASSERT "Clang! Crash! The troll parries." <CO-RESUME ,CO "kill troll with sword">>
     <ASSERT "The troll is confused and can't fight back." <CO-RESUME ,CO "kill troll with sword">>
@@ -55,13 +55,13 @@
     ;<ASSERT-TEXT "The unarmed troll cannot defend himself: He dies." <CO-RESUME ,CO "kill troll with sword">>
     ;<ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop sword">>
     <ASSERT-TEXT "East-West Passage" <CO-RESUME ,CO "walk east">>
-    <ASSERT-TEXT "Round Room" <CO-RESUME ,CO "walk east">>
-    <ASSERT-TEXT "Engravings Cave" <CO-RESUME ,CO "walk southe">>
-    <ASSERT-TEXT "Dome Room" <CO-RESUME ,CO "walk east">>
+    <ASSERT "Reach Round Room" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,ROUND-ROOM>>
+    <ASSERT "Reach Engravings Cave" <CO-RESUME ,CO "walk southe" T> <==? ,HERE ,ENGRAVINGS-CAVE>>
+    <ASSERT "Reach Dome Room" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,DOME-ROOM>>
     <ASSERT-TEXT "The rope drops over the side and comes within ten feet of the floor." <CO-RESUME ,CO "tie rope to railing">>
-    <ASSERT-TEXT "Torch Room" <CO-RESUME ,CO "walk down">>
+    <ASSERT "Reach Torch Room" <CO-RESUME ,CO "walk down" T> <==? ,HERE ,TORCH-ROOM>>
     <ASSERT-TEXT "Temple" <CO-RESUME ,CO "walk south">>
-    <ASSERT-TEXT "Egyptian Room" <CO-RESUME ,CO "walk east">>
+    <ASSERT "Reach Egyptian Room" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,EGYPT-ROOM>>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take coffin">>
     <ASSERT-TEXT "Temple" <CO-RESUME ,CO "walk west">>
     <ASSERT-TEXT "Altar" <CO-RESUME ,CO "walk south">>
@@ -69,10 +69,10 @@
     <ASSERT-TEXT "The brass lantern is now off." <CO-RESUME ,CO "turn off lamp">>
     <ASSERT-TEXT "Forest" <CO-RESUME ,CO "walk south">>
     <ASSERT-TEXT "Clearing" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Canyon View" <CO-RESUME ,CO "walk east">>
-    <ASSERT-TEXT "Rocky Ledge" <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "Canyon Bottom" <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "End of Rainbow" <CO-RESUME ,CO "walk north">>
+    <ASSERT "Reach Canyon View" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,CANYON-VIEW>>
+    <ASSERT "Reach Rocky Ledge" <CO-RESUME ,CO "walk down" T> <==? ,HERE ,CLIFF-MIDDLE>>
+    <ASSERT "Reach Canyon Bottom" <CO-RESUME ,CO "walk down" T> <==? ,HERE ,CANYON-BOTTOM>>
+    <ASSERT "Reach End of Rainbow" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,END-OF-RAINBOW>>
     <ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop coffin">>
     <ASSERT-TEXT "The gold coffin opens." <CO-RESUME ,CO "open coffin">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take sceptre">>
@@ -97,9 +97,9 @@
     <ASSERT-TEXT "The Troll Room" <CO-RESUME ,CO "walk north">>
     <ASSERT-TEXT "East-West Passage" <CO-RESUME ,CO "walk east">>
     <ASSERT-TEXT "Chasm" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Reservoir South" <CO-RESUME ,CO "walk northe">>
+    <ASSERT "Reach Reservoir South" <CO-RESUME ,CO "walk northe" T> <==? ,HERE ,RESERVOIR-SOUTH>>
     <ASSERT-TEXT "Dam" <CO-RESUME ,CO "walk east">>
-    <ASSERT-TEXT "Dam Lobby" <CO-RESUME ,CO "walk north">>
+    <ASSERT "Reach Dam Lobby" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,DAM-LOBBY>>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take matches">>
     <ASSERT-TEXT "Maintenance Room" <CO-RESUME ,CO "walk north">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take wrench">>
@@ -110,7 +110,7 @@
     <ASSERT-TEXT "The sluice gates open and water pours through the dam." <CO-RESUME ,CO "turn bolt with wrench">>
     <ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop wrench">>
     <ASSERT-TEXT "Deep Canyon" <CO-RESUME ,CO "walk south">>
-    <ASSERT-TEXT "Loud Room" <CO-RESUME ,CO "walk down">>
+    <ASSERT-TEXT "deafeningly loud" <CO-RESUME ,CO "walk down">> ;"The roar drives the player back out"
     <SETG HERE ,ROUND-ROOM>
     <MOVE ,ADVENTURER ,HERE>
     <ASSERT-TEXT "Engravings Cave" <CO-RESUME ,CO "walk southe">>
@@ -124,37 +124,37 @@
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take candles">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take book">>
     <ASSERT-TEXT "Cave" <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "Entrance to Hades" <CO-RESUME ,CO "walk down">>
+    <ASSERT "Reach Entrance to Hades" <CO-RESUME ,CO "walk down" T> <==? ,HERE ,ENTRANCE-TO-HADES>>
     <ASSERT-TEXT "The bell suddenly becomes red hot and falls to the ground." <CO-RESUME ,CO "ring bell">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take candles">>
     <ASSERT-TEXT "One of the matches starts to burn." <CO-RESUME ,CO "light match">>
     <ASSERT-TEXT "The candles are lit." <CO-RESUME ,CO "light candles with match">>
     <ASSERT-TEXT "Each word of the prayer reverberates through the hall in a deafening confusion." <CO-RESUME ,CO "read book">>
     <ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop book">>
-    <ASSERT-TEXT "Land of the Dead" <CO-RESUME ,CO "walk south">>
+    <ASSERT "Reach Land of the Dead" <CO-RESUME ,CO "walk south" T> <==? ,HERE ,LAND-OF-LIVING-DEAD>>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take skull">>
     <ASSERT-TEXT "Entrance to Hades" <CO-RESUME ,CO "walk north">>
     <ASSERT-TEXT "Cave" <CO-RESUME ,CO "walk up">>
-    <ASSERT-TEXT "Mirror Room" <CO-RESUME ,CO "walk north">>
+    <ASSERT "Reach Mirror Room" <CO-RESUME ,CO "walk north" T> <EQUAL? ,HERE ,MIRROR-ROOM-1 ,MIRROR-ROOM-2>>
     <ASSERT-TEXT "There is a rumble from deep within the earth and the room shakes." <CO-RESUME ,CO "rub mirror">>
-    <ASSERT-TEXT "Cold Passage" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Slide Room" <CO-RESUME ,CO "walk west">>
-    <ASSERT-TEXT "Mine Entrance" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Squeaky Room" <CO-RESUME ,CO "walk west">>
+    <ASSERT "Reach Cold Passage" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,COLD-PASSAGE>>
+    <ASSERT "Reach Slide Room" <CO-RESUME ,CO "walk west" T> <==? ,HERE ,SLIDE-ROOM>>
+    <ASSERT "Reach Mine Entrance" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,MINE-ENTRANCE>>
+    <ASSERT "Reach Squeaky Room" <CO-RESUME ,CO "walk west" T> <==? ,HERE ,SQUEEKY-ROOM>>
     <ASSERT-TEXT "You are carrying:" <CO-RESUME ,CO "inventory">>
-    <ASSERT-TEXT "Bat Room" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Shaft Room" <CO-RESUME ,CO "walk east">>
+    <ASSERT "Reach Bat Room" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,BAT-ROOM>>
+    <ASSERT "Reach Shaft Room" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,SHAFT-ROOM>>
     <ASSERT-TEXT "Done." <CO-RESUME ,CO "put torch in basket">>
     <ASSERT-TEXT "Done." <CO-RESUME ,CO "put screwdriver in basket">>
     <ASSERT-TEXT "The brass lantern is now on." <CO-RESUME ,CO "turn on lamp">>
-    <ASSERT-TEXT "Smelly Room" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Gas Room" <CO-RESUME ,CO "walk down">>
+    <ASSERT "Reach Smelly Room" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,SMELLY-ROOM>>
+    <ASSERT "Reach Gas Room" <CO-RESUME ,CO "walk down" T> <==? ,HERE ,GAS-ROOM>>
     <ASSERT-TEXT "Coal Mine" <CO-RESUME ,CO "walk east">>
     <ASSERT-TEXT "Coal Mine" <CO-RESUME ,CO "walk northe">>
     <ASSERT-TEXT "Coal Mine" <CO-RESUME ,CO "walk southe">>
     <ASSERT-TEXT "Coal Mine" <CO-RESUME ,CO "walk southwest">>
-    <ASSERT-TEXT "Ladder Top" <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "Ladder Bottom" <CO-RESUME ,CO "walk down">>
+    <ASSERT "Reach Ladder Top" <CO-RESUME ,CO "walk down" T> <==? ,HERE ,LADDER-TOP>>
+    <ASSERT "Reach Ladder Bottom" <CO-RESUME ,CO "walk down" T> <==? ,HERE ,LADDER-BOTTOM>>
     <ASSERT-TEXT "Dead End" <CO-RESUME ,CO "walk south">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take coal">>
     <ASSERT-TEXT "Ladder Bottom" <CO-RESUME ,CO "walk north">>
@@ -176,13 +176,13 @@
     <ASSERT-TEXT "Coal Mine" <CO-RESUME ,CO "walk southwest">>
     <ASSERT-TEXT "Ladder Top" <CO-RESUME ,CO "walk down">>
     <ASSERT-TEXT "Ladder Bottom" <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "Timber Room" <CO-RESUME ,CO "walk west">>
+    <ASSERT "Reach Timber Room" <CO-RESUME ,CO "walk west" T> <==? ,HERE ,TIMBER-ROOM>>
     <ASSERT-TEXT "crystal skull: Dropped." <CO-RESUME ,CO "drop all">>
     <ASSERT-TEXT "Drafty Room" <CO-RESUME ,CO "walk west">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take coal">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take screwdriver">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take torch">>
-    <ASSERT-TEXT "Machine Room" <CO-RESUME ,CO "walk south">>
+    <ASSERT "Reach Machine Room" <CO-RESUME ,CO "walk south" T> <==? ,HERE ,MACHINE-ROOM>>
     <ASSERT-TEXT "The lid opens." <CO-RESUME ,CO "open lid">>
     <ASSERT-TEXT "Done." <CO-RESUME ,CO "put coal in machine">>
     <ASSERT-TEXT "The lid closes." <CO-RESUME ,CO "close lid">>
@@ -227,12 +227,12 @@
     <ASSERT-TEXT "The Troll Room" <CO-RESUME ,CO "walk north">>
     <ASSERT-TEXT "East-West Passage" <CO-RESUME ,CO "walk east">>
     <ASSERT-TEXT "Chasm" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Reservoir South" <CO-RESUME ,CO "walk northe">>
-    <ASSERT-TEXT "Reservoir" <CO-RESUME ,CO "walk north">>
+    <ASSERT "Reach Reservoir South" <CO-RESUME ,CO "walk northe" T> <==? ,HERE ,RESERVOIR-SOUTH>>
+    <ASSERT "Reach Reservoir" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,RESERVOIR>>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take trunk">>
-    <ASSERT-TEXT "Reservoir North" <CO-RESUME ,CO "walk north">>
+    <ASSERT "Reach Reservoir North" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,RESERVOIR-NORTH>>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take pump">>
-    <ASSERT-TEXT "Atlantis Room" <CO-RESUME ,CO "walk north">>
+    <ASSERT "Reach Atlantis Room" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,ATLANTIS-ROOM>>
     <ASSERT-TEXT "Your load is too heavy." <CO-RESUME ,CO "take trident">>
     <ASSERT-TEXT "You are carrying:" <CO-RESUME ,CO "inventory">>
     <ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop torch">>
@@ -241,7 +241,7 @@
     <ASSERT-TEXT "Reservoir" <CO-RESUME ,CO "walk south">>
     <ASSERT-TEXT "Reservoir South" <CO-RESUME ,CO "walk south">>
     <ASSERT-TEXT "Dam" <CO-RESUME ,CO "walk east">>
-    <ASSERT-TEXT "Dam Base" <CO-RESUME ,CO "walk east">>
+    <ASSERT "Reach Dam Base" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,DAM-BASE>>
     ;"replaced command to use new INFLAT syntax"
     <ASSERT-TEXT "The boat inflates and appears seaworthy." <CO-RESUME ,CO "inflat plastic with pump">>
     <ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop pump">>
@@ -259,7 +259,7 @@
     <ASSERT-TEXT "Your load is too heavy." <CO-RESUME ,CO "take shovel">>
     <ASSERT-TEXT "Dropped." <CO-RESUME ,CO "drop buoy">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take shovel">>
-    <ASSERT-TEXT "Sandy Cave" <CO-RESUME ,CO "walk northe">>
+    <ASSERT "Reach Sandy Cave" <CO-RESUME ,CO "walk northe" T> <==? ,HERE ,SANDY-CAVE>>
     <ASSERT-TEXT "What do you want to dig?" <CO-RESUME ,CO "dig">>
     <ASSERT-TEXT "(with the shovel)" <CO-RESUME ,CO "sand">>
     <ASSERT-TEXT "(with the shovel)" <CO-RESUME ,CO "dig sand">>
@@ -289,9 +289,9 @@
     <ASSERT-TEXT "Done." <CO-RESUME ,CO "put jewels in case">>
     <ASSERT-TEXT "Kitchen" <CO-RESUME ,CO "walk east">>
     <ASSERT-TEXT "Behind House" <CO-RESUME ,CO "walk east">>
-    <ASSERT-TEXT "North of House" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Forest Path" <CO-RESUME ,CO "walk north">>
-    <ASSERT-TEXT "Up a Tree" <CO-RESUME ,CO "climb tree">>
+    <ASSERT "Reach North of House" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,NORTH-OF-HOUSE>>
+    <ASSERT "Reach Forest Path" <CO-RESUME ,CO "walk north" T> <==? ,HERE ,PATH>>
+    <ASSERT "Reach Up a Tree" <CO-RESUME ,CO "climb tree" T> <==? ,HERE ,UP-A-TREE>>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take egg">>
     <ASSERT-TEXT "(tree)" <CO-RESUME ,CO "climb down">>
     <ASSERT-TEXT "North of House" <CO-RESUME ,CO "walk south">>
@@ -310,11 +310,11 @@
     <ASSERT-TEXT "Maze" <CO-RESUME ,CO "walk southwest">>
     <ASSERT-TEXT "Maze" <CO-RESUME ,CO "walk east">>
     <ASSERT-TEXT "Maze" <CO-RESUME ,CO "walk south">>
-    <ASSERT-TEXT "Cyclops Room" <CO-RESUME ,CO "walk southe">>
+    <ASSERT "Reach Cyclops Room" <CO-RESUME ,CO "walk southe" T> <==? ,HERE ,CYCLOPS-ROOM>>
     <ASSERT-TEXT "The cyclops, hearing the name of his father's deadly nemesis, flees the room by knocking down the wall on the east of the room." <CO-RESUME ,CO "Ulysses">>
     <ASSERT "Move thief to Cyclops Room for testing" <MOVE ,THIEF ,CYCLOPS-ROOM> <FCLEAR ,THIEF INVISIBLE>>
     <ASSERT-TEXT "The thief is taken aback by your unexpected generosity, but accepts the jewel-encrusted egg and stops to admire its beauty." <CO-RESUME ,CO "give egg to thief">>
-    <ASSERT-TEXT "Strange Passage" <CO-RESUME ,CO "walk east">>
+    <ASSERT "Reach Strange Passage" <CO-RESUME ,CO "walk east" T> <==? ,HERE ,STRANGE-PASSAGE>>
     <ASSERT-TEXT "Living Room" <CO-RESUME ,CO "walk east">>
     <ASSERT-TEXT "Done." <CO-RESUME ,CO "put coins in case">>
     <ASSERT-TEXT "Taken." <CO-RESUME ,CO "take knife">>
@@ -337,7 +337,7 @@
     <ASSERT-TEXT "Maze" <CO-RESUME ,CO "walk west">>
     <ASSERT-TEXT "Maze" <CO-RESUME ,CO "walk up">>
     <ASSERT-TEXT "You won't be able to get back up to the tunnel you are going through when it gets to the next room." <CO-RESUME ,CO "walk down">>
-    <ASSERT-TEXT "Grating Room" <CO-RESUME ,CO "walk northe">>
+    <ASSERT "Reach Grating Room" <CO-RESUME ,CO "walk northe" T> <==? ,HERE ,GRATING-ROOM>>
     ;<ASSERT-TEXT "grate" description="Unlock the grate" <CO-RESUME ,CO "unlock grate">>
     <CO-RESUME ,CO "unlock grate">
     <ASSERT-TEXT "The grating opens to reveal trees above you." <CO-RESUME ,CO "open grate">>
diff --git a/main.lua b/main.lua
index 2ff7ebe..86b74a6 100644
--- a/main.lua
+++ b/main.lua
@@ -131,13 +131,50 @@ local function companion_selector(query)
   end
 end
 
+-- The arrow-key widget needs a terminal. Piped or scripted input gets a
+-- numbered menu read a line at a time: a number picks a choice, anything
+-- else is typed as a command.
+local interactive = os.execute("test -t 0") == true
+
+local function numbered_selector(query)
+  local displayed = {}
+  local function print_group(title, group)
+    local shown = false
+    for _, choice in ipairs(query.choices) do
+      if (choice.group or "scene") == group then
+        if not shown then io.write("\n" .. title .. "\n") shown = true end
+        table.insert(displayed, choice)
+        io.write(string.format("  %d. %s\n", #displayed, choice.label))
+      end
+    end
+  end
+  if query.scene and query.scene.alt then
+    io.write("\n" .. query.scene.alt .. "\n")
+  end
+  io.write("\nWhat will you do?\n")
+  print_group("In this scene", "scene")
+  print_group("Go somewhere", "move")
+  io.write("\nChoose a number, or type any command: ")
+  local input = io.read()
+  if not input then os.exit(0) end
+  local trimmed = input:match("^%s*(.-)%s*$")
+  local index = tonumber(trimmed)
+  local choice = index and displayed[index]
+  if choice then
+    io.write("\n> " .. choice.command .. "\n\n")
+    return {kind = "choice", id = choice.id, command = choice.command}
+  end
+  io.write("\n")
+  return {kind = "typed", command = trimmed}
+end
+
 while game:is_running() do
   local command
 
   if options.interface == "companion" then
     local query = env.COMPANION_QUERY()
     if query.ok and #query.choices > 0 then
-      local result = companion_selector(query)
+      local result = (interactive and companion_selector or numbered_selector)(query)
       if result.kind == "choice" then
         local selected = env.COMPANION_SELECT(result.id)
         if selected.ok then
diff --git a/tests/test_limehouse_companion.lua b/tests/test_limehouse_companion.lua
index 19505cb..5fa4279 100644
--- a/tests/test_limehouse_companion.lua
+++ b/tests/test_limehouse_companion.lua
@@ -41,10 +41,14 @@ local function run_companion(choices)
     return output
 end
 
+-- Piped input gets the numbered menu (main.lua). A first visit prints a
+-- room's prose without its name, which hosts set as a heading, so rooms are
+-- recognized by their own words.
+
 -- Test 1: Companion loads without errors
 test("companion loads", function()
     local output = run_companion({})
-    assert_contains(output, "Ashworth Manor Gate")
+    assert_contains(output, "Wet iron bars")
     assert_contains(output, "Choose a number")
 end)
 
@@ -69,14 +73,14 @@ end)
 -- Test 5: Entering manor from gate
 test("enter manor works", function()
     local output = run_companion({"1", "3"})
-    assert_contains(output, "Entrance Hall")
+    assert_contains(output, "measured hush")
 end)
 
 -- Test 6: Library accessible from hall
 test("library accessible", function()
     -- Gate: read telegram(1), enter(3), Hall: try study(1), go library(4)
     local output = run_companion({"1", "3", "1", "4"})
-    assert_contains(output, "Library")
+    assert_contains(output, "Floor-to-ceiling bookshelves")
 end)
 
 -- Test 7: Library shows torn page choice
diff --git a/tests/test_limehouse_walkthrough.lua b/tests/test_limehouse_walkthrough.lua
index 07bc7a1..e3b6d59 100644
--- a/tests/test_limehouse_walkthrough.lua
+++ b/tests/test_limehouse_walkthrough.lua
@@ -108,6 +108,9 @@ test.describe("Limehouse Killings walkthrough", function(t)
 		local suffix = " --save " .. shell_quote(savefile) .. " --game limehouse-killings"
 		assert.assert_equal(run_command("lua5.4 llm.lua --new-game" .. suffix), 0)
 
+		-- A first visit prints the room's description without its name, which
+		-- hosts set as a heading (infocom/zork1/verbs.zil DESCRIBE-ROOM); each
+		-- move is recognized by its own prose.
 		local actions = {
 			{"examine me", "eyes are prehensile"},
 			{"examine myself", "eyes are prehensile"},
@@ -116,16 +119,16 @@ test.describe("Limehouse Killings walkthrough", function(t)
 			{"examine fog", "fog swirls"},
 			{"examine gates", "iron gates"},
 			{"examine path", "gravel path"},
-			{"go north", "Entrance Hall"},
+			{"go north", "Doorways lead south to the gate"},
 			{"examine chandelier", "chandelier hangs"},
 			{"examine portraits", "Portraits of the Ashworth family"},
 			{"examine rug", "Persian rug"},
-			{"go down", "Kitchen"},
+			{"go down", "seen better days"},
 			{"pull servant bell", "distant bell rings"},
 			{"use servant bell", "distant bell rings"},
-			{"go west", "Garden"},
+			{"go west", "overgrown hedges"},
 			{"take footprint cast", "take the footprint cast"},
-			{"go south", "Servants' Quarters"},
+			{"go south", "narrow beds"},
 			{"examine mister hudson", "Mr. Hudson"},
 			{"ask hudson", "What do you want to ask Mr. Hudson about"},
 			{"tell hudson about footprint-cast", "don't know anything about that"},
@@ -165,10 +168,10 @@ test.describe("Limehouse Killings walkthrough", function(t)
 		assert.assert_equal(run_command("lua5.4 llm.lua --new-game" .. suffix), 0)
 
 		local actions = {
-			{"go north", "Entrance Hall"},
-			{"go down", "Kitchen"},
-			{"go west", "Garden"},
-			{"go south", "Servants' Quarters"},
+			{"go north", "Doorways lead south to the gate"},
+			{"go down", "seen better days"},
+			{"go west", "overgrown hedges"},
+			{"go south", "narrow beds"},
 			{"ask hudson about key", "hands you the keyring"},
 			{"go north", "Garden"},
 			{"go east", "Kitchen"},
@@ -178,7 +181,7 @@ test.describe("Limehouse Killings walkthrough", function(t)
 			{"look", "closed but unlocked"},
 			{"open study door", "You open the study door"},
 			{"look", "stands open, revealing the study beyond"},
-			{"go north", "Study"},
+			{"go north", "chalk outline"},
 		}
 
 		for _, entry in ipairs(actions) do
diff --git a/zilscript/bootstrap.lua b/zilscript/bootstrap.lua
index 9d87fff..709e338 100644
--- a/zilscript/bootstrap.lua
+++ b/zilscript/bootstrap.lua
@@ -957,6 +957,12 @@ local function io_flush()
 	return text
 end
 
+-- What the story printed since the last prompt. A host takes it when the
+-- game ends, since no READ yields that last text.
+function TAKE_OUTPUT()
+	return io_flush()
+end
+
 local function is_control_signal(signal, kind)
 	if kind then
 		return signal == ZIL_CONTROL_SIGNALS[kind]
diff --git a/zilscript/choice_widget.lua b/zilscript/choice_widget.lua
index ed6620a..2400322 100644
--- a/zilscript/choice_widget.lua
+++ b/zilscript/choice_widget.lua
@@ -88,7 +88,7 @@ local function run_loop(config, terminal)
           selected = 0
           dirty = true
         end
-      elseif key.kind == "interrupt" then
+      elseif key.kind == "interrupt" or key.kind == "eof" then
         return {kind = "interrupt"}
       elseif key.kind == "text" and allow_text then
         typed = typed .. key.text
diff --git a/zilscript/runtime.lua b/zilscript/runtime.lua
index 853a5a7..70d330f 100644
--- a/zilscript/runtime.lua
+++ b/zilscript/runtime.lua
@@ -300,41 +300,46 @@ end
 -- Create a coroutine for the game that yields on input
 -- Returns a coroutine object
 function M.create_game(env, silent)
+	-- The ending's text: printed after the last READ, so no prompt yields it.
+	local function final_output()
+		if type(env.TAKE_OUTPUT) == "function" then return env.TAKE_OUTPUT() end
+	end
 	local co
 	co = coroutine.create(function()
 		-- Check if we're restoring from a save (LLM mode)
-		local restored = rawget(_G, "_LLM_RESTORED")
-		if restored then
-			-- Skip GO() initialization, go directly to MAIN_LOOP
-			local success = M.execute("MAIN_LOOP()", 'main', env, silent)
-			if not success then
-				error("Failed to start game: MAIN_LOOP() not defined or failed")
-			end
-		else
-			-- Normal game start
-			if type(env.GO) ~= "function" then
-				error("Failed to start game: GO() not defined or failed")
+		-- A restored save skips GO()'s initialization and re-enters the main
+		-- loop. Both entries run under the same handler, so an ending's QUIT
+		-- or RESTART after a restore ends or restarts the game rather than
+		-- escaping as a raw control signal.
+		local entry = env.GO
+		if rawget(_G, "_LLM_RESTORED") then
+			entry = env.MAIN_LOOP
+			if type(entry) ~= "function" then
+				error("Failed to start game: MAIN_LOOP() not defined")
 			end
+		elseif type(entry) ~= "function" then
+			error("Failed to start game: GO() not defined or failed")
 		end
 
 		while true do
-			local ok, result = pcall(env.GO)
+			local ok, result = pcall(entry)
 			if ok then
 				if not silent then
 					print("\n*** Game has ended ***\n")
 				end
-				return result
+				return final_output()
 			end
 
 			if type(env.IS_ZIL_CONTROL_SIGNAL) == "function"
 				and env.IS_ZIL_CONTROL_SIGNAL(result, "restart") then
 				-- RESTART restores captured state and re-enters GO().
+				entry = env.GO
 			elseif type(env.IS_ZIL_CONTROL_SIGNAL) == "function"
 				and env.IS_ZIL_CONTROL_SIGNAL(result, "quit") then
 				if not silent then
 					print("\n*** Game has ended ***\n")
 				end
-				return
+				return final_output()
 			else
 				error(tostring(result), 0)
 			end
diff --git a/zilscript/terminal.lua b/zilscript/terminal.lua
index 9f9c738..9cebbdb 100644
--- a/zilscript/terminal.lua
+++ b/zilscript/terminal.lua
@@ -61,7 +61,8 @@ end
 function Terminal:read_key()
   local char = self.stdin:read(1)
   if not char then
-    return nil
+    -- The input ended (a closed pipe): there is nothing left to choose.
+    return {kind = "eof"}
   end
 
   if char == "\27" then