diff --git a/experiment.t b/experiment.t
index 29c0205..dfbf3ec 100644
--- a/experiment.t
+++ b/experiment.t
@@ -37,9 +37,9 @@ gameMain: GameMainDef
     <<inputManager.pauseForMore(true)>>
     Enter <q>instruction</q> if you need a tutorial.\b";
   }
-  showGoodbye () {"
-    <.p>Game over<.p>
-  ";}
+  showGoodbye () {
+    "\bGame over\b";
+  }
 ;
 
 /*  */
diff --git a/src/item/lockers.t b/src/item/lockers.t
index 7e9a9b2..69690c5 100644
--- a/src/item/lockers.t
+++ b/src/item/lockers.t
@@ -35,7 +35,7 @@ modify VerbRule(SetTo)
       if (curSetting == aliceLocker.code) {
         aliceLocker.makeLocked(nil);
         aliceLocker.makeOpen(true);
-        "The middle drawer opened with a click. ";
+        "The middle locker opened with a click. ";
       } else {
         " You heard an annoying sound and
           a red light flashed on the keypad. ";
diff --git a/src/room/orangeRoom.t b/src/room/orangeRoom.t
index 442f04b..0da258e 100644
--- a/src/room/orangeRoom.t
+++ b/src/room/orangeRoom.t
@@ -70,37 +70,32 @@ orangeRoom: DarkRoom
   specialNominalRoomPartLocation = defaultNorthWall
 ;
 
-+ orangeBed: Bed, Heavy
++ Bed, Heavy
   'ascetic bed'
   'ascetic bed'
   "It has a plastic frame and an unsprung mattress. "
 ;
 
-+ desk: Heavy, Surface
++ Heavy, Surface
   'white desk/table'
   'white desk'
   " This white desk has some marks on working surface
     and a single drawer. "
 ;
 
-  ++ Decoration
-    'letters/label/mark*marks'
-    'some scratched letters'
-    "You can't make out the inscription. "
-  ;
+++ Decoration
+  'letters/label/mark*marks'
+  'some scratched letters'
+  "You can't make out the inscription. "
+;
 
-  ++ drawer: Component, OpenableContainer
-    'drawer'
-    'drawer'
-    "It looks like it should open easily. "
-  ;
+++ Component, OpenableContainer
+  'drawer'
+  'drawer'
+  "It looks like it should open easily. "
+;
 
-    +++ whiteCube: Thing
-      'white cube'
-      'white cube'
-      "Small glossy white cube. ";
-
-    +++ blackCube: Thing
-      'black cube'
-      'black cube'
-      "Small glossy black cube. ";
++++ Thing
+  'lighter'
+  'lighter'
+  "The lighter that ran out of fuel. ";