diff --git a/src/Dodge/Data/Prop.hs b/src/Dodge/Data/Prop.hs
index d14d45a28..d5c892570 100644
--- a/src/Dodge/Data/Prop.hs
+++ b/src/Dodge/Data/Prop.hs
@@ -10,60 +10,46 @@ import Data.Aeson.TH
 import Dodge.Data.WorldEffect
 import Geometry.Data
 import qualified Quaternion as Q
-import Shape.Data
 import ShapePicture.Data
 
-data Prop
-    = PropZ
-        { _prPos :: Point2
-        , _prDraw :: PropDraw
-        , _prUpdate :: PropUpdate
-        , _prStartPos :: Point2
-        , _prVel :: Point2
-        , _prID :: Int
-        , _prPosZ :: Float
-        , _prVelZ :: Float
-        , _prQuat :: Q.Quaternion Float
-        , _prQuatSpin :: Q.Quaternion Float
-        , _prColor :: Color
-        }
-    | ShapeProp
-        { _prPos :: Point2
-        , _prDraw :: PropDraw
-        , _prUpdate :: PropUpdate
-        , _prID :: Int
-        , _prRot :: Float
-        , _prToggle :: Bool
-        }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+data Prop = ShapeProp
+    { _prPos :: Point2
+    , _prDraw :: PropDraw
+    , _prUpdate :: PropUpdate
+    , _prID :: Int
+    , _prRot :: Float
+    , _prToggle :: Bool
+    }
 
-data DebrisType =
-    Gib {_gibSize :: Float
-        ,_gibColor :: Color
+data DebrisType
+    = Gib
+        { _gibSize :: Float
+        , _gibColor :: Color
         }
     | BlockDebris {_bdColor :: Color}
 
 data Debris = DebrisChunk
-        { _dbPos :: Point3
-        , _dbType :: DebrisType
-        , _dbVel :: Point3
-        , _dbRot :: Q.Quaternion Float
-        , _dbSpin :: Q.Quaternion Float
-        }
+    { _dbPos :: Point3
+    , _dbType :: DebrisType
+    , _dbVel :: Point3
+    , _dbRot :: Q.Quaternion Float
+    , _dbSpin :: Q.Quaternion Float
+    }
 
 --data PropType = FallingBlock Material
 
 data PropDraw
     = PropDrawSPic SPic
-    | PropDrawMovingShapeCol Shape
-    | PropDrawMovingShape PropDraw
-    | PropDrawFlatTranslate PropDraw
+    | --    | PropDrawMovingShapeCol Shape
+      --    | PropDrawMovingShape PropDraw
+      PropDrawFlatTranslate PropDraw
     | PropDoubleLampCover Float
     | PropVerticalLampCover Float
     | PropLampCover Float
     | PropDrawToggle PropDraw
+
 --    | PropDrawGib Float
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PropUpdate
     = PropUpdateId
@@ -75,13 +61,15 @@ data PropUpdate
     | PropUpdatePosition WdP2f
     | PropUpdateWhen WdBl PropUpdate
     | PropUpdateIf WdBl PropUpdate PropUpdate
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PrWdLsLs
     = PrWdLsId
     | PrWdLsSetPosition WdP2f Point3
     | PrWdLsSetColor Point3
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Prop
 makeLenses ''Debris
diff --git a/src/Dodge/Placement/Instance/LightSource.hs b/src/Dodge/Placement/Instance/LightSource.hs
index 5cbeb0170..ebbcbc57d 100644
--- a/src/Dodge/Placement/Instance/LightSource.hs
+++ b/src/Dodge/Placement/Instance/LightSource.hs
@@ -42,7 +42,6 @@ propLSThen propf lsf ls prop cont = pt0 (PutLS ls) $
 
 moveLSThen ::
     WdP2f -> --(World -> (Point2,Float))
-
     -- | light source offset
     Point3 ->
     Shape ->
diff --git a/src/Dodge/Prop/Draw.hs b/src/Dodge/Prop/Draw.hs
index 9a9c32d76..43491fb2e 100644
--- a/src/Dodge/Prop/Draw.hs
+++ b/src/Dodge/Prop/Draw.hs
@@ -26,8 +26,8 @@ debrisSPic db = translateSP (_dbPos db) . overPosSP (Q.rotate (_dbRot db)) $
 drawProp :: PropDraw -> Prop -> SPic
 drawProp = \case
     PropDrawSPic spic -> const spic
-    PropDrawMovingShape pd' -> \pr -> drawMovingShape pr (drawProp pd' pr)
-    PropDrawMovingShapeCol sh -> (`drawMovingShapeCol` sh)
+--    PropDrawMovingShape pd' -> \pr -> drawMovingShape pr (drawProp pd' pr)
+--    PropDrawMovingShapeCol sh -> (`drawMovingShapeCol` sh)
     PropDoubleLampCover h -> drawDoubleLampCover h
     PropVerticalLampCover h -> drawVerticalLampCover h
     PropLampCover h -> drawLampCover h
@@ -78,19 +78,19 @@ drawVerticalLampCover h pr =
             $ rectNSWE 2 (-2) (-5) 5
         )
 
-drawMovingShape :: Prop -> SPic -> SPic
-drawMovingShape pr =
-    translateSPz (_prPosZ pr)
-        . uncurryV translateSPxy (_prPos pr)
-        . overPosSP (Q.rotate (_prQuat pr))
+--drawMovingShape :: Prop -> SPic -> SPic
+--drawMovingShape pr =
+--    translateSPz (_prPosZ pr)
+--        . uncurryV translateSPxy (_prPos pr)
+--        . overPosSP (Q.rotate (_prQuat pr))
 
-drawMovingShapeCol :: Prop -> Shape -> SPic
-drawMovingShapeCol pr =
-    noPic
-        . translateSHz (_prPosZ pr)
-        . uncurryV translateSHxy (_prPos pr)
-        . overPosSH (Q.rotate (_prQuat pr))
-        . colorSH (_prColor pr)
+--drawMovingShapeCol :: Prop -> Shape -> SPic
+--drawMovingShapeCol pr =
+--    noPic
+--        . translateSHz (_prPosZ pr)
+--        . uncurryV translateSHxy (_prPos pr)
+--        . overPosSH (Q.rotate (_prQuat pr))
+--        . colorSH (_prColor pr)
 
 drawDoubleLampCover :: Float -> Prop -> SPic
 drawDoubleLampCover h pr =
diff --git a/src/Dodge/Room/Airlock.hs b/src/Dodge/Room/Airlock.hs
index 666d09203..2739c3bca 100644
--- a/src/Dodge/Room/Airlock.hs
+++ b/src/Dodge/Room/Airlock.hs
@@ -153,9 +153,6 @@ airlockSimple =
     y2 = (0, pi / 2)
     x2 = (0, pi)
 
---    outDoorps = (V2 0 0,) <$> arcStepwise 3 (negate $ pi / 2) (V2 0 0) (V2 0 55)
---    inDoorps = (V2 0 0,) <$> arcStepwise 3 (negate $ pi / 2) (V2 0 0) (V2 (-55) 0)
-
 airlockZ :: RandomGen g => State g Room
 airlockZ = do
     let cenlight = mntLS vShape (V2 90 60) (V3 90 40 50) `addPlmnt` mntLS vShape (V2 90 60) (V3 90 80 50)
diff --git a/src/Dodge/Room/LongDoor.hs b/src/Dodge/Room/LongDoor.hs
index 68177ee61..b103635e2 100644
--- a/src/Dodge/Room/LongDoor.hs
+++ b/src/Dodge/Room/LongDoor.hs
@@ -137,7 +137,6 @@ addButtonSlowDoor x h rm = do
             putDoubleDoorThen
                 DoorObstacle
                 thewall
---                (WdBlBtNotOff $ fromJust $ _plMID btplmnt)
                 (WdBlBtOn $ fromJust $ _plMID btplmnt)
                 30
                 (V2 0 h)
diff --git a/tags b/tags
index 9e907a618..b54231679 100644
--- a/tags
+++ b/tags
@@ -131,7 +131,7 @@ BlSh	src/Dodge/Data/Block.hs	42;"	t
 BlShConst	src/Dodge/Data/Block.hs	44;"	C
 BlShMempty	src/Dodge/Data/Block.hs	43;"	C
 Block	src/Dodge/Data/Block.hs	20;"	t
-BlockDebris	src/Dodge/Data/Prop.hs	44;"	C
+BlockDebris	src/Dodge/Data/Prop.hs	31;"	C
 BlockDegradeSound	src/Dodge/Data/SoundOrigin.hs	30;"	C
 BlockDraw	src/Dodge/Data/Block.hs	35;"	t
 BlockDrawBlSh	src/Dodge/Data/Block.hs	37;"	C
@@ -315,9 +315,9 @@ DamageHitSound	src/Dodge/Data/SoundOrigin.hs	40;"	C
 DamageLaser	src/Dodge/Data/Laser.hs	15;"	C
 DamageSensor	src/Dodge/Data/Machine/Sensor.hs	19;"	t
 DamageType	src/Dodge/Data/Damage/Type.hs	3;"	t
-Debris	src/Dodge/Data/Prop.hs	46;"	t
-DebrisChunk	src/Dodge/Data/Prop.hs	46;"	C
-DebrisType	src/Dodge/Data/Prop.hs	40;"	t
+Debris	src/Dodge/Data/Prop.hs	33;"	t
+DebrisChunk	src/Dodge/Data/Prop.hs	33;"	C
+DebrisType	src/Dodge/Data/Prop.hs	27;"	t
 DebugBool	src/Dodge/Data/Config.hs	66;"	t
 DebugItem	src/Dodge/Data/Universe.hs	57;"	t
 DebugLayer	src/Picture/Data.hs	25;"	C
@@ -493,7 +493,7 @@ GenericFaction	src/Dodge/Data/Creature/State.hs	13;"	C
 GeoObjShads	src/Dodge/Data/Config.hs	102;"	C
 GetTo	src/Dodge/Data/ActionPlan.hs	141;"	C
 GetToPoint	src/Dodge/Data/Scenario.hs	12;"	C
-Gib	src/Dodge/Data/Prop.hs	41;"	C
+Gib	src/Dodge/Data/Prop.hs	28;"	C
 Glass	src/Dodge/Data/Material.hs	9;"	C
 GlassBreakSound	src/Dodge/Data/SoundOrigin.hs	33;"	C
 Goal	src/Dodge/Data/ActionPlan.hs	149;"	t
@@ -995,10 +995,10 @@ Polyhedron	src/Polyhedra/Data.hs	13;"	C
 PosInf	src/Dodge/Data/CardinalPoint.hs	36;"	C
 PosRooms	src/Dodge/Tree/Shift.hs	28;"	t
 Posture	src/Dodge/Data/Creature/Stance.hs	33;"	t
-PrWdLsId	src/Dodge/Data/Prop.hs	81;"	C
-PrWdLsLs	src/Dodge/Data/Prop.hs	80;"	t
-PrWdLsSetColor	src/Dodge/Data/Prop.hs	83;"	C
-PrWdLsSetPosition	src/Dodge/Data/Prop.hs	82;"	C
+PrWdLsId	src/Dodge/Data/Prop.hs	68;"	C
+PrWdLsLs	src/Dodge/Data/Prop.hs	67;"	t
+PrWdLsSetColor	src/Dodge/Data/Prop.hs	70;"	C
+PrWdLsSetPosition	src/Dodge/Data/Prop.hs	69;"	C
 PreloadData	src/Data/Preload.hs	10;"	t
 PrimitiveMode	src/Shader/Data.hs	99;"	t
 PrintMaterial	src/Dodge/Data/AmmoType.hs	12;"	C
@@ -1008,26 +1008,25 @@ ProjectileParams	src/Dodge/Data/Item/Use.hs	51;"	C
 ProjectileStabiliserSF	src/Dodge/Data/ComposedItem.hs	36;"	C
 ProjectileType	src/Dodge/Data/Projectile.hs	30;"	t
 Prop	src/Dodge/Data/Prop.hs	16;"	t
-PropDoubleLampCover	src/Dodge/Data/Prop.hs	61;"	C
-PropDraw	src/Dodge/Data/Prop.hs	56;"	t
-PropDrawFlatTranslate	src/Dodge/Data/Prop.hs	60;"	C
-PropDrawMovingShape	src/Dodge/Data/Prop.hs	59;"	C
-PropDrawMovingShapeCol	src/Dodge/Data/Prop.hs	58;"	C
-PropDrawSPic	src/Dodge/Data/Prop.hs	57;"	C
-PropDrawToggle	src/Dodge/Data/Prop.hs	64;"	C
-PropLampCover	src/Dodge/Data/Prop.hs	63;"	C
-PropRotate	src/Dodge/Data/Prop.hs	71;"	C
-PropSetToggleAnd	src/Dodge/Data/Prop.hs	72;"	C
-PropUpdate	src/Dodge/Data/Prop.hs	68;"	t
-PropUpdateAnd	src/Dodge/Data/Prop.hs	70;"	C
-PropUpdateId	src/Dodge/Data/Prop.hs	69;"	C
-PropUpdateIf	src/Dodge/Data/Prop.hs	77;"	C
-PropUpdateLS	src/Dodge/Data/Prop.hs	74;"	C
-PropUpdatePosition	src/Dodge/Data/Prop.hs	75;"	C
-PropUpdateWhen	src/Dodge/Data/Prop.hs	76;"	C
-PropUpdates	src/Dodge/Data/Prop.hs	73;"	C
-PropVerticalLampCover	src/Dodge/Data/Prop.hs	62;"	C
-PropZ	src/Dodge/Data/Prop.hs	17;"	C
+PropDoubleLampCover	src/Dodge/Data/Prop.hs	48;"	C
+PropDraw	src/Dodge/Data/Prop.hs	43;"	t
+PropDrawFlatTranslate	src/Dodge/Data/Prop.hs	47;"	C
+PropDrawMovingShape	src/Dodge/Data/Prop.hs	46;"	C
+PropDrawMovingShapeCol	src/Dodge/Data/Prop.hs	45;"	C
+PropDrawSPic	src/Dodge/Data/Prop.hs	44;"	C
+PropDrawToggle	src/Dodge/Data/Prop.hs	51;"	C
+PropLampCover	src/Dodge/Data/Prop.hs	50;"	C
+PropRotate	src/Dodge/Data/Prop.hs	58;"	C
+PropSetToggleAnd	src/Dodge/Data/Prop.hs	59;"	C
+PropUpdate	src/Dodge/Data/Prop.hs	55;"	t
+PropUpdateAnd	src/Dodge/Data/Prop.hs	57;"	C
+PropUpdateId	src/Dodge/Data/Prop.hs	56;"	C
+PropUpdateIf	src/Dodge/Data/Prop.hs	64;"	C
+PropUpdateLS	src/Dodge/Data/Prop.hs	61;"	C
+PropUpdatePosition	src/Dodge/Data/Prop.hs	62;"	C
+PropUpdateWhen	src/Dodge/Data/Prop.hs	63;"	C
+PropUpdates	src/Dodge/Data/Prop.hs	60;"	C
+PropVerticalLampCover	src/Dodge/Data/Prop.hs	49;"	C
 ProxSensor	src/Dodge/Data/Machine/Sensor.hs	25;"	C
 ProximityRequirement	src/Dodge/Data/Machine/Sensor.hs	34;"	t
 ProximitySensor	src/Dodge/Data/Machine/Sensor.hs	25;"	t
@@ -1186,7 +1185,7 @@ ShaderTexture	src/Shader/Data.hs	94;"	t
 ShadowFidelity	src/Shape/Data.hs	19;"	t
 ShadowRendering	src/Dodge/Data/Config.hs	101;"	t
 Shape	src/Shape/Data.hs	48;"	t
-ShapeProp	src/Dodge/Data/Prop.hs	30;"	C
+ShapeProp	src/Dodge/Data/Prop.hs	17;"	C
 ShapeType	src/Shape/Data.hs	11;"	t
 Shattering	src/Dodge/Data/Damage.hs	20;"	C
 Shell	src/Dodge/Data/Projectile.hs	15;"	C
@@ -1533,7 +1532,7 @@ _avatarMaterial	src/Dodge/Data/Creature/Misc.hs	61;"	f
 _avatarPulse	src/Dodge/Data/Creature/Misc.hs	60;"	f
 _barrelShader	src/Data/Preload/Render.hs	23;"	f
 _barrelType	src/Dodge/Data/Creature/Misc.hs	71;"	f
-_bdColor	src/Dodge/Data/Prop.hs	44;"	f
+_bdColor	src/Dodge/Data/Prop.hs	31;"	f
 _bdMaxX	src/Dodge/Data/Bounds.hs	12;"	f
 _bdMaxY	src/Dodge/Data/Bounds.hs	14;"	f
 _bdMinX	src/Dodge/Data/Bounds.hs	11;"	f
@@ -1706,11 +1705,11 @@ _cwgRoomClipping	src/Dodge/Data/CWorld.hs	40;"	f
 _cwgSeed	src/Dodge/Data/CWorld.hs	41;"	f
 _cwgWorldBounds	src/Dodge/Data/CWorld.hs	38;"	f
 _cylinderSize	src/Shape/Data.hs	14;"	f
-_dbPos	src/Dodge/Data/Prop.hs	47;"	f
-_dbRot	src/Dodge/Data/Prop.hs	50;"	f
-_dbSpin	src/Dodge/Data/Prop.hs	51;"	f
-_dbType	src/Dodge/Data/Prop.hs	48;"	f
-_dbVel	src/Dodge/Data/Prop.hs	49;"	f
+_dbPos	src/Dodge/Data/Prop.hs	34;"	f
+_dbRot	src/Dodge/Data/Prop.hs	37;"	f
+_dbSpin	src/Dodge/Data/Prop.hs	38;"	f
+_dbType	src/Dodge/Data/Prop.hs	35;"	f
+_dbVel	src/Dodge/Data/Prop.hs	36;"	f
 _debris	src/Dodge/Data/LWorld.hs	99;"	f
 _debugFunction	src/Dodge/Data/Universe.hs	59;"	f
 _debugMessage	src/Dodge/Data/Universe.hs	58;"	f
@@ -1758,21 +1757,21 @@ _doReplicateAction	src/Dodge/Data/ActionPlan.hs	113;"	f
 _doReplicateTimes	src/Dodge/Data/ActionPlan.hs	107;"	f
 _doReplicateTimes	src/Dodge/Data/ActionPlan.hs	112;"	f
 _doors	src/Dodge/Data/LWorld.hs	118;"	f
-_drDeath	src/Dodge/Data/Door.hs	44;"	f
-_drFootPrint	src/Dodge/Data/Door.hs	42;"	f
-_drHP	src/Dodge/Data/Door.hs	43;"	f
+_drDeath	src/Dodge/Data/Door.hs	40;"	f
+_drFootPrint	src/Dodge/Data/Door.hs	38;"	f
+_drHP	src/Dodge/Data/Door.hs	39;"	f
 _drID	src/Dodge/Data/Door.hs	31;"	f
-_drLerp	src/Dodge/Data/Door.hs	41;"	f
-_drMech	src/Dodge/Data/Door.hs	35;"	f
-_drMounts	src/Dodge/Data/Door.hs	48;"	f
-_drObstacleType	src/Dodge/Data/Door.hs	50;"	f
-_drOnePos	src/Dodge/Data/Door.hs	40;"	f
-_drPushedBy	src/Dodge/Data/Door.hs	46;"	f
-_drPushes	src/Dodge/Data/Door.hs	47;"	f
-_drSpeed	src/Dodge/Data/Door.hs	45;"	f
-_drTrigger	src/Dodge/Data/Door.hs	34;"	f
+_drLerp	src/Dodge/Data/Door.hs	37;"	f
+_drMech	src/Dodge/Data/Door.hs	34;"	f
+_drMounts	src/Dodge/Data/Door.hs	44;"	f
+_drObstacleType	src/Dodge/Data/Door.hs	46;"	f
+_drOnePos	src/Dodge/Data/Door.hs	36;"	f
+_drPushedBy	src/Dodge/Data/Door.hs	42;"	f
+_drPushes	src/Dodge/Data/Door.hs	43;"	f
+_drSpeed	src/Dodge/Data/Door.hs	41;"	f
+_drTrigger	src/Dodge/Data/Door.hs	33;"	f
 _drWallIDs	src/Dodge/Data/Door.hs	32;"	f
-_drZeroPos	src/Dodge/Data/Door.hs	39;"	f
+_drZeroPos	src/Dodge/Data/Door.hs	35;"	f
 _dsPos	src/Dodge/Data/Cloud.hs	28;"	f
 _dsTimer	src/Dodge/Data/Cloud.hs	30;"	f
 _dsType	src/Dodge/Data/Cloud.hs	31;"	f
@@ -1833,8 +1832,8 @@ _getSoundID	src/Sound/Data.hs	30;"	f
 _gfConstant	src/Dodge/Data/GenFloat.hs	9;"	f
 _gfMax	src/Dodge/Data/GenFloat.hs	10;"	f
 _gfMin	src/Dodge/Data/GenFloat.hs	10;"	f
-_gibColor	src/Dodge/Data/Prop.hs	42;"	f
-_gibSize	src/Dodge/Data/Prop.hs	41;"	f
+_gibColor	src/Dodge/Data/Prop.hs	29;"	f
+_gibSize	src/Dodge/Data/Prop.hs	28;"	f
 _gnHitEffect	src/Dodge/Data/Projectile.hs	31;"	f
 _grBound	src/Dodge/GameRoom.hs	15;"	f
 _grDir	src/Dodge/GameRoom.hs	17;"	f
@@ -2098,24 +2097,13 @@ _playStatus	src/Sound/Data.hs	15;"	f
 _playingSounds	src/Dodge/Data/World.hs	40;"	f
 _posture	src/Dodge/Data/Creature/Stance.hs	17;"	f
 _prBounds	src/Dodge/Tree/Shift.hs	29;"	f
-_prColor	src/Dodge/Data/Prop.hs	28;"	f
 _prDraw	src/Dodge/Data/Prop.hs	19;"	f
-_prDraw	src/Dodge/Data/Prop.hs	32;"	f
-_prID	src/Dodge/Data/Prop.hs	23;"	f
-_prID	src/Dodge/Data/Prop.hs	34;"	f
+_prID	src/Dodge/Data/Prop.hs	21;"	f
 _prPos	src/Dodge/Data/Prop.hs	18;"	f
-_prPos	src/Dodge/Data/Prop.hs	31;"	f
-_prPosZ	src/Dodge/Data/Prop.hs	24;"	f
-_prQuat	src/Dodge/Data/Prop.hs	26;"	f
-_prQuatSpin	src/Dodge/Data/Prop.hs	27;"	f
 _prRooms	src/Dodge/Tree/Shift.hs	30;"	f
-_prRot	src/Dodge/Data/Prop.hs	35;"	f
-_prStartPos	src/Dodge/Data/Prop.hs	21;"	f
-_prToggle	src/Dodge/Data/Prop.hs	36;"	f
+_prRot	src/Dodge/Data/Prop.hs	22;"	f
+_prToggle	src/Dodge/Data/Prop.hs	23;"	f
 _prUpdate	src/Dodge/Data/Prop.hs	20;"	f
-_prUpdate	src/Dodge/Data/Prop.hs	33;"	f
-_prVel	src/Dodge/Data/Prop.hs	22;"	f
-_prVelZ	src/Dodge/Data/Prop.hs	25;"	f
 _preloadData	src/Dodge/Data/Universe.hs	31;"	f
 _pressedKeys	src/Dodge/Data/Input.hs	37;"	f
 _projectiles	src/Dodge/Data/LWorld.hs	100;"	f
@@ -2499,7 +2487,7 @@ _xNum	src/Dodge/Data/Item/Combine.hs	170;"	f
 aFlame	src/Dodge/Gas.hs	20;"	f
 aGasCloud	src/Dodge/Gas.hs	15;"	f
 aRadarPulse	src/Dodge/RadarSweep.hs	20;"	f
-aShape	src/Dodge/Placement/Instance/LightSource.hs	121;"	f
+aShape	src/Dodge/Placement/Instance/LightSource.hs	120;"	f
 aSound	src/Dodge/SoundLogic.hs	74;"	f
 aTreeStrut	src/Dodge/Tree/GenerateStructure.hs	42;"	f
 accessTerminal	src/Dodge/WorldEffect.hs	54;"	f
@@ -2512,7 +2500,7 @@ addCrGibs	src/Dodge/Prop/Gib.hs	17;"	f
 addDepth	src/Picture/Base.hs	133;"	f
 addDoorAtNthLinkToggleTerminal	src/Dodge/Room/Warning.hs	40;"	f
 addDoorToggleTerminal	src/Dodge/Room/Warning.hs	37;"	f
-addDoorWall	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	61;"	f
+addDoorWall	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	56;"	f
 addGib4	src/Dodge/Prop/Gib.hs	52;"	f
 addGibAt	src/Dodge/Prop/Gib.hs	63;"	f
 addGibAtDir	src/Dodge/Prop/Gib.hs	69;"	f
@@ -2549,12 +2537,12 @@ aimStanceInfo	src/Dodge/Item/Info.hs	243;"	f
 aimTurn	src/Dodge/Creature/YourControl.hs	181;"	f
 airlock	src/Dodge/Room/Airlock.hs	23;"	f
 airlock0	src/Dodge/Room/Airlock.hs	71;"	f
-airlock90	src/Dodge/Room/Airlock.hs	208;"	f
-airlockCrystal	src/Dodge/Room/Airlock.hs	253;"	f
+airlock90	src/Dodge/Room/Airlock.hs	205;"	f
+airlockCrystal	src/Dodge/Room/Airlock.hs	250;"	f
 airlockDoor	src/Dodge/Room/Airlock.hs	98;"	f
 airlockDoubleDoor	src/Dodge/Room/Airlock.hs	101;"	f
 airlockSimple	src/Dodge/Room/Airlock.hs	117;"	f
-airlockZ	src/Dodge/Room/Airlock.hs	159;"	f
+airlockZ	src/Dodge/Room/Airlock.hs	156;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	225;"	f
 alongSegBy	src/Geometry.hs	40;"	f
 alteRifle	src/Dodge/Item/Held/Cane.hs	22;"	f
@@ -3006,7 +2994,7 @@ crsNearPoint	src/Dodge/Zoning/Creature.hs	18;"	f
 crsNearRect	src/Dodge/Zoning/Creature.hs	39;"	f
 crsNearSeg	src/Dodge/Zoning/Creature.hs	24;"	f
 crystalLine	src/Dodge/Placement/Instance/Wall.hs	55;"	f
-cubeShape	src/Dodge/Block/Debris.hs	103;"	f
+cubeShape	src/Dodge/Block/Debris.hs	105;"	f
 cullPoint	src/Dodge/Render/ShapePicture.hs	94;"	f
 cullPretty	src/AesonHelp.hs	14;"	f
 cutPoly	src/Dodge/LevelGen/StaticWalls.hs	77;"	f
@@ -3061,7 +3049,7 @@ deadScalp	src/Dodge/Creature/Picture.hs	81;"	f
 deadUpperBody	src/Dodge/Creature/Picture.hs	113;"	f
 debrisS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	684;"	f
 debrisSPic	src/Dodge/Prop/Draw.hs	20;"	f
-debrisSize	src/Dodge/Block/Debris.hs	77;"	f
+debrisSize	src/Dodge/Block/Debris.hs	79;"	f
 debugEvent	src/Dodge/Debug.hs	36;"	f
 debugEvents	src/Dodge/Debug.hs	21;"	f
 debugItem	src/Dodge/Debug.hs	39;"	f
@@ -3210,7 +3198,7 @@ doDebugTestF12	src/Dodge/Update/Input/DebugTest.hs	84;"	f
 doDebugTestF6	src/Dodge/Update/Input/DebugTest.hs	41;"	f
 doDebugTestF7	src/Dodge/Update/Input/DebugTest.hs	51;"	f
 doDebugTestF8	src/Dodge/Update/Input/DebugTest.hs	59;"	f
-doDrWdWd	src/Dodge/DrWdWd.hs	14;"	f
+doDrWdWd	src/Dodge/DrWdWd.hs	12;"	f
 doDrag	src/Dodge/Update/Input/InGame.hs	127;"	f
 doDrawing	src/Dodge/Render.hs	34;"	f
 doDrawing'	src/Dodge/Render.hs	45;"	f
@@ -3253,7 +3241,7 @@ doWorldEvents	src/Dodge/Update.hs	428;"	f
 doWorldPos	src/Dodge/WorldPos.hs	10;"	f
 door	src/Dodge/Room/Door.hs	14;"	f
 doorBetween	src/Dodge/Placement/Instance/Door.hs	39;"	f
-doorLerp	src/Dodge/DrWdWd.hs	20;"	f
+doorLerp	src/Dodge/DrWdWd.hs	18;"	f
 dotV	src/Geometry/Vector.hs	76;"	f
 dotV3	src/Geometry/Vector3D.hs	119;"	f
 doubleCorridorBarrels	src/Dodge/Room/Room.hs	276;"	f
@@ -3344,7 +3332,6 @@ drawMenuScreen	src/Dodge/Render/MenuScreen.hs	14;"	f
 drawMouseCursor	src/Dodge/Render/Picture.hs	85;"	f
 drawMouseOver	src/Dodge/Render/HUD.hs	109;"	f
 drawMousePosition	src/Dodge/Debug/Picture.hs	373;"	f
-drawMovingShape	src/Dodge/Prop/Draw.hs	81;"	f
 drawMovingShapeCol	src/Dodge/Prop/Draw.hs	87;"	f
 drawOptions	src/Dodge/Render/MenuScreen.hs	22;"	f
 drawPathBetween	src/Dodge/Debug/Picture.hs	201;"	f
@@ -3737,7 +3724,7 @@ horPipe	src/Dodge/Placement/Instance/Pipe.hs	9;"	f
 hotkeyToChar	src/Dodge/Inventory/SelectionList.hs	188;"	f
 hotkeyToScancode	src/Dodge/Creature/YourControl.hs	82;"	f
 hotkeyToString	src/Dodge/Inventory/SelectionList.hs	185;"	f
-iShape	src/Dodge/Placement/Instance/LightSource.hs	87;"	f
+iShape	src/Dodge/Placement/Instance/LightSource.hs	86;"	f
 icosahedronPoints	src/Polyhedra/Geodesic.hs	12;"	f
 icosohedronFaces	src/Polyhedra/Geodesic.hs	19;"	f
 ildtPropagate	src/Dodge/DoubleTree.hs	111;"	f
@@ -3912,7 +3899,7 @@ itmBaseInfo	src/Dodge/Item/Info.hs	30;"	f
 itmEquipSiteInfo	src/Dodge/Item/Info.hs	250;"	f
 itmSpaceInfo	src/Dodge/Item/Info.hs	25;"	f
 itmUsageInfo	src/Dodge/Item/Info.hs	230;"	f
-jShape	src/Dodge/Placement/Instance/LightSource.hs	99;"	f
+jShape	src/Dodge/Placement/Instance/LightSource.hs	98;"	f
 joinItemsInList	src/Dodge/Item/Grammar.hs	206;"	f
 joystick	src/Dodge/Item/Scope.hs	149;"	f
 jps0'	src/Dodge/LevelGen/PlacementHelper.hs	60;"	f
@@ -3935,7 +3922,7 @@ knifeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	638;"	f
 lChasm	src/Dodge/Room/Tutorial.hs	130;"	f
 lConnect	src/Dodge/Render/Connectors.hs	42;"	f
 lConnectMulti	src/Dodge/Render/Connectors.hs	46;"	f
-lShape	src/Dodge/Placement/Instance/LightSource.hs	90;"	f
+lShape	src/Dodge/Placement/Instance/LightSource.hs	89;"	f
 lamp	src/Dodge/Creature/Lamp.hs	21;"	f
 lampCover	src/Dodge/Placement/Instance/LightSource/Cover.hs	8;"	f
 lampCoverWhen	src/Dodge/Placement/Instance/LightSource/Cover.hs	19;"	f
@@ -3975,7 +3962,7 @@ leftRightCombine	src/Dodge/Item/Grammar.hs	197;"	f
 leftWristPQ	src/Dodge/Creature/HandPos.hs	81;"	f
 legsSPic	src/Dodge/Item/Draw/SPic.hs	468;"	f
 lerpP2A	src/Dodge/ShiftPoint.hs	14;"	f
-liShape	src/Dodge/Placement/Instance/LightSource.hs	112;"	f
+liShape	src/Dodge/Placement/Instance/LightSource.hs	111;"	f
 light	src/Color.hs	104;"	f
 lightSensByDoor	src/Dodge/Room/LasTurret.hs	51;"	f
 lightSensInsideDoor	src/Dodge/Room/LasTurret.hs	39;"	f
@@ -4070,7 +4057,7 @@ main	test/Spec.hs	12;"	f
 makeArc	src/Picture/Base.hs	157;"	f
 makeAttach	src/Dodge/Item/Attach.hs	10;"	f
 makeBlip	src/Dodge/RadarSweep.hs	70;"	f
-makeBlockDebris	src/Dodge/Block/Debris.hs	34;"	f
+makeBlockDebris	src/Dodge/Block/Debris.hs	36;"	f
 makeBoolOption	src/Dodge/Menu/OptionType.hs	8;"	f
 makeBullet	src/Dodge/HeldUse.hs	979;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
@@ -4079,9 +4066,9 @@ makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	7;"	f
 makeColorTermLine	src/Dodge/Terminal.hs	111;"	f
 makeColorTermPara	src/Dodge/Terminal.hs	108;"	f
 makeCorpse	src/Dodge/Corpse/Make.hs	13;"	f
-makeDebris	src/Dodge/Block/Debris.hs	45;"	f
-makeDebrisDirected	src/Dodge/Block/Debris.hs	48;"	f
-makeDoorDebris	src/Dodge/Block/Debris.hs	24;"	f
+makeDebris	src/Dodge/Block/Debris.hs	47;"	f
+makeDebrisDirected	src/Dodge/Block/Debris.hs	50;"	f
+makeDoorDebris	src/Dodge/Block/Debris.hs	25;"	f
 makeDustAt	src/Dodge/WorldEvent/Cloud.hs	17;"	f
 makeEnumOption	src/Dodge/Menu/OptionType.hs	13;"	f
 makeExplosionAt	src/Dodge/WorldEvent/Explosion.hs	73;"	f
@@ -4209,11 +4196,11 @@ mixColorsLinear	src/Color.hs	95;"	f
 mkCustomLenses	src/ThirdPartyLens.hs	7;"	f
 mkGraphFromEdges	src/GraphHelp.hs	4;"	f
 mkNode	src/Dodge/Graph.hs	29;"	f
-mntLS	src/Dodge/Placement/Instance/LightSource.hs	137;"	f
-mntLSCond	src/Dodge/Placement/Instance/LightSource.hs	160;"	f
-mntLSOn	src/Dodge/Placement/Instance/LightSource.hs	67;"	f
-mntLightLnkCond	src/Dodge/Placement/Instance/LightSource.hs	177;"	f
-mntLightLnkCond'	src/Dodge/Placement/Instance/LightSource.hs	182;"	f
+mntLS	src/Dodge/Placement/Instance/LightSource.hs	136;"	f
+mntLSCond	src/Dodge/Placement/Instance/LightSource.hs	159;"	f
+mntLSOn	src/Dodge/Placement/Instance/LightSource.hs	66;"	f
+mntLightLnkCond	src/Dodge/Placement/Instance/LightSource.hs	176;"	f
+mntLightLnkCond'	src/Dodge/Placement/Instance/LightSource.hs	181;"	f
 modTo	src/Geometry/Zone.hs	10;"	f
 mouseClickOptionsList	src/Dodge/Update/Input/ScreenLayer.hs	60;"	f
 mouseCursorType	src/Dodge/Render/Picture.hs	92;"	f
@@ -4397,7 +4384,7 @@ plNewID	src/Dodge/Base/NewID.hs	7;"	f
 plNewUpID	src/Dodge/Base/NewID.hs	13;"	f
 plNewUsing	src/Dodge/Base/NewID.hs	27;"	f
 plRRpt	src/Dodge/LevelGen/PlacementHelper.hs	33;"	f
-plSlideDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	87;"	f
+plSlideDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	82;"	f
 plTurret	src/Dodge/Placement/PlaceSpot.hs	219;"	f
 placeChasm	src/Dodge/Placement/PlaceSpot.hs	161;"	f
 placeMachineWalls	src/Dodge/Placement/PlaceSpot.hs	264;"	f
@@ -4567,7 +4554,7 @@ putBlockV	src/Dodge/Placement/Instance/Wall.hs	153;"	f
 putDoubleDoor	src/Dodge/Placement/Instance/Door.hs	17;"	f
 putDoubleDoorThen	src/Dodge/Placement/Instance/Door.hs	21;"	f
 putImmediateMessageTerminal	src/Dodge/Placement/Instance/Terminal.hs	66;"	f
-putLamp	src/Dodge/Placement/Instance/LightSource.hs	223;"	f
+putLamp	src/Dodge/Placement/Instance/LightSource.hs	222;"	f
 putLasTurret	src/Dodge/Placement/Instance/Turret.hs	24;"	f
 putLitButOnPos	src/Dodge/Placement/Instance/Button.hs	65;"	f
 putLitButOnPosExtTrig	src/Dodge/Placement/Instance/Button.hs	103;"	f
@@ -4994,8 +4981,8 @@ slap1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	670;"	f
 slapS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	604;"	f
 slideDoorS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	688;"	f
 slideWindow	src/ListHelp.hs	80;"	f
-slowDoorRoom	src/Dodge/Room/LongDoor.hs	156;"	f
-slowDoorRoomRunPast	src/Dodge/Room/LongDoor.hs	173;"	f
+slowDoorRoom	src/Dodge/Room/LongDoor.hs	155;"	f
+slowDoorRoomRunPast	src/Dodge/Room/LongDoor.hs	172;"	f
 smallBattery	src/Dodge/Item/Ammo.hs	60;"	f
 smallBranch	src/Dodge/Tree/GenerateStructure.hs	32;"	f
 smallChaseCrit	src/Dodge/Creature/ChaseCrit.hs	14;"	f
@@ -5032,10 +5019,10 @@ soundWithStatus	src/Dodge/SoundLogic.hs	104;"	f
 soundWithStatusVolume	src/Dodge/SoundLogic.hs	54;"	f
 southPillarsRoom	src/Dodge/Room/LongDoor.hs	87;"	f
 spaceAction	src/Dodge/Update/Input/InGame.hs	528;"	f
-spanColLightBlackI	src/Dodge/Placement/Instance/LightSource.hs	207;"	f
-spanColLightI	src/Dodge/Placement/Instance/LightSource.hs	200;"	f
-spanLS	src/Dodge/Placement/Instance/LightSource.hs	192;"	f
-spanLightI	src/Dodge/Placement/Instance/LightSource.hs	214;"	f
+spanColLightBlackI	src/Dodge/Placement/Instance/LightSource.hs	206;"	f
+spanColLightI	src/Dodge/Placement/Instance/LightSource.hs	199;"	f
+spanLS	src/Dodge/Placement/Instance/LightSource.hs	191;"	f
+spanLightI	src/Dodge/Placement/Instance/LightSource.hs	213;"	f
 sparkDam	src/Dodge/Spark.hs	36;"	f
 sparkGun	src/Dodge/Item/Held/BatteryGuns.hs	13;"	f
 sparkRandDir	src/Dodge/Spark.hs	116;"	f
@@ -5384,8 +5371,8 @@ updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
 updateDistortions	src/Dodge/Update.hs	558;"	f
 updateDoor	src/Dodge/Update.hs	310;"	f
-updateDoorEdge	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	79;"	f
-updateDoorEdges	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	76;"	f
+updateDoorEdge	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	74;"	f
+updateDoorEdges	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	71;"	f
 updateDust	src/Dodge/Update.hs	822;"	f
 updateDusts	src/Dodge/Update.hs	672;"	f
 updateEdge	src/Dodge/Path.hs	49;"	f
@@ -5516,7 +5503,7 @@ vCen3	src/Geometry/Vector3D.hs	115;"	f
 vInverse	src/Geometry/Vector.hs	154;"	f
 vNormal	src/Geometry/Vector.hs	149;"	f
 vNormaly	src/Geometry/Vector3D.hs	72;"	f
-vShape	src/Dodge/Placement/Instance/LightSource.hs	127;"	f
+vShape	src/Dodge/Placement/Instance/LightSource.hs	126;"	f
 vToL	src/MatrixHelper.hs	46;"	f
 vToQuat	src/Quaternion.hs	42;"	f
 validTerminalCommands	src/Dodge/Debug/Terminal.hs	137;"	f