diff --git a/src/Dodge/Creature/Impulse.hs b/src/Dodge/Creature/Impulse.hs
index 08fc9e882..010de4e03 100644
--- a/src/Dodge/Creature/Impulse.hs
+++ b/src/Dodge/Creature/Impulse.hs
@@ -55,7 +55,7 @@ followImpulse cr w imp = case imp of
         ( hitCr cid'
         , crMvAbsolute (10 *.* normalizeV (posFromID cid' -.- cpos)) $ cr & crMeleeCooldown .~ 20
         )
-    RandomTurn a -> (randGen .~ snd (rr a), cr & crDir +~ (fst $ rr a))
+    RandomTurn a -> (randGen .~ snd (rr a), cr & crDir +~ fst (rr a))
     MakeSound sid -> (soundStart (CrSound (_crID cr)) (_crPos cr) sid Nothing, cr)
     DropItem -> undefined
     ChangeStrategy strat -> crup $ cr & crActionPlan . apStrategy .~ strat
diff --git a/src/Dodge/Render/Picture.hs b/src/Dodge/Render/Picture.hs
index c1f9bea70..3c79d2db5 100644
--- a/src/Dodge/Render/Picture.hs
+++ b/src/Dodge/Render/Picture.hs
@@ -29,6 +29,13 @@ fixedCoordPictures u =
         <> displayFrameTicks u
         <> aimDelaySweep (u ^. uvWorld)
         <> drawMouseCursor u
+        <> ( toTopLeft cfig . translate (1.3 * halfWidth cfig) 0
+                . drawList
+                . take 50
+                . drop (u ^. uvDebugMessageOffset)
+                . map text
+                $ foldMap (`_debugMessage` u) (_uvDebug u) -- other debug pics in extraPics
+           )
   where
     cfig = _uvConfig u
     hw = halfWidth cfig
@@ -80,30 +87,30 @@ mouseCursorType :: Universe -> Picture
 mouseCursorType u = case u ^. uvWorld . input . mouseContext of
     NoMouseContext -> drawEmptySet 5
     MouseAiming -> rotate a (drawPlus 5)
-    MouseMenuClick {} -> drawMenuClick 5
+    MouseMenuClick{} -> drawMenuClick 5
     MouseMenuCursor -> drawMenuCursor 5
     MouseInGame -> drawPlus 5
-    OverInvDrag 0 (Just (3,_)) _ _ -> drawDragDrop 5
+    OverInvDrag 0 (Just (3, _)) _ _ -> drawDragDrop 5
     OverInvDrag 0 Nothing _ _ -> drawDragDrop 5
-    OverInvDrag 0 (Just (0,_)) _ _ -> drawDrag 5
+    OverInvDrag 0 (Just (0, _)) _ _ -> drawDrag 5
     OverInvDrag 0 _ _ _ -> drawEmptySet 5
-    OverInvDrag 3 (Just (3,_)) _ _ -> drawDrag 5
-    OverInvDrag 3 (Just (0,_)) _ _ -> drawDragPickup 5
-    OverInvDrag 3 (Just (1,_)) _ _ -> drawDragPickup 5
+    OverInvDrag 3 (Just (3, _)) _ _ -> drawDrag 5
+    OverInvDrag 3 (Just (0, _)) _ _ -> drawDragPickup 5
+    OverInvDrag 3 (Just (1, _)) _ _ -> drawDragPickup 5
     OverInvDrag 3 Nothing _ _ -> drawDragPickup 5
     OverInvDrag 3 _ _ _ -> drawEmptySet 5
-    OverInvDrag {} -> drawEmptySet 5
-    OverInvDragSelect {} -> drawDragSelect 5
-    OverInvSelect (-1,_) | selsec == Just (-1) -> drawJumpDown 5
-    OverInvSelect (2,_)  | selsec == Just 2-> drawJumpDown 5
-    OverInvSelect {} -> drawSelect 5
-    OverCombFiltInv {} -> drawCombFilter 5
-    OverCombSelect {} -> drawSelect 5
-    OverCombFilter {} -> drawJumpDown 5
-    OverCombCombine {} -> drawGapPlus 5
-    OverCombEscape -> rotate (pi/4) $ drawPlus 5
-    OverTerminalReturn {} -> drawReturn 5
-    OverTerminalEscape -> rotate (pi/4) $ drawPlus 5
+    OverInvDrag{} -> drawEmptySet 5
+    OverInvDragSelect{} -> drawDragSelect 5
+    OverInvSelect (-1, _) | selsec == Just (-1) -> drawJumpDown 5
+    OverInvSelect (2, _) | selsec == Just 2 -> drawJumpDown 5
+    OverInvSelect{} -> drawSelect 5
+    OverCombFiltInv{} -> drawCombFilter 5
+    OverCombSelect{} -> drawSelect 5
+    OverCombFilter{} -> drawJumpDown 5
+    OverCombCombine{} -> drawGapPlus 5
+    OverCombEscape -> rotate (pi / 4) $ drawPlus 5
+    OverTerminalReturn{} -> drawReturn 5
+    OverTerminalEscape -> rotate (pi / 4) $ drawPlus 5
   where
     w = u ^. uvWorld
     selsec = u ^? uvWorld . hud . hudElement . diSelection . _Just . _1
@@ -114,32 +121,36 @@ mouseCursorType u = case u ^. uvWorld . input . mouseContext of
                 - w ^. wCam . camRot
 
 drawEmptySet :: Float -> Picture
-drawEmptySet x = fold
-    [line [V2 x x,V2 (-x) (-x)]
-    ,circle x
-    ]
+drawEmptySet x =
+    fold
+        [ line [V2 x x, V2 (- x) (- x)]
+        , circle x
+        ]
 
 drawReturn :: Float -> Picture
-drawReturn x = fold 
-    [line [V2 0 0, V2 y y]
-    ,line [V2 0 0, V2 y (-y)]
-    ,line [V2 0 0, V2 (2*y) 0]
-    ,line [V2 (2*y) 0, V2 (2*y) (2*x)]
-    ]
+drawReturn x =
+    fold
+        [ line [V2 0 0, V2 y y]
+        , line [V2 0 0, V2 y (- y)]
+        , line [V2 0 0, V2 (2 * y) 0]
+        , line [V2 (2 * y) 0, V2 (2 * y) (2 * x)]
+        ]
   where
     y = 0.7 * x
+
 --drawReturn = scale 0.1 0.1 . translate (-50) (-100) $ text [toEnum 153]
 
 drawPlus :: Float -> Picture
 drawPlus x = fold [line [V2 (- x) 0, V2 x 0], line [V2 0 (- x), V2 0 x]]
 
 drawMenuClick :: Float -> Picture
-drawMenuClick z = fold
-    [ line [V2 y 0, V2 x 0]
-    , line [V2 ny 0, V2 nx 0]
-    , line [V2 0 ny , V2 0 nx]
-    , line [V2 0 y , V2 0 x]
-    ]
+drawMenuClick z =
+    fold
+        [ line [V2 y 0, V2 x 0]
+        , line [V2 ny 0, V2 nx 0]
+        , line [V2 0 ny, V2 0 nx]
+        , line [V2 0 y, V2 0 x]
+        ]
   where
     x = 0.5 * z
     y = x + z
@@ -147,12 +158,13 @@ drawMenuClick z = fold
     nx = - x
 
 drawMenuCursor :: Float -> Picture
-drawMenuCursor z = fold
-    [ line [V2 y 0, V2 x 0]
-    , line [V2 ny 0, V2 nx 0]
-    , line [V2 0 ny , V2 0 nx]
-    , line [V2 0 y , V2 0 x]
-    ]
+drawMenuCursor z =
+    fold
+        [ line [V2 y 0, V2 x 0]
+        , line [V2 ny 0, V2 nx 0]
+        , line [V2 0 ny, V2 0 nx]
+        , line [V2 0 y, V2 0 x]
+        ]
   where
     x = z
     y = x + z
@@ -160,37 +172,39 @@ drawMenuCursor z = fold
     nx = - x
 
 drawJumpDown :: Float -> Picture
-drawJumpDown x = rotate (0.25*pi) 
-    $ fold [line [V2 0 0, V2 x 0], line [V2 0 0, V2 0 x]]
+drawJumpDown x =
+    rotate (0.25 * pi) $
+        fold [line [V2 0 0, V2 x 0], line [V2 0 0, V2 0 x]]
 
 drawDragSelect :: Float -> Picture
 drawDragSelect x = polygonWire $ rectWH (0.5 * x) x
 
 drawDrag :: Float -> Picture
-drawDrag x = line [V2 0 y,V2 0 z]
-    <> line [V2 0 (-y),V2 0 (-z)]
-    <> line [V2 (-w) (z-w), V2 0 z, V2 w (z-w)]
-    <> line [V2 (-w) (w-z), V2 0 (-z), V2 w (w-z)]
-    <> drawSelect 5
+drawDrag x =
+    line [V2 0 y, V2 0 z]
+        <> line [V2 0 (- y), V2 0 (- z)]
+        <> line [V2 (- w) (z - w), V2 0 z, V2 w (z - w)]
+        <> line [V2 (- w) (w - z), V2 0 (- z), V2 w (w - z)]
+        <> drawSelect 5
   where
     z = 1.5 * x
     y = 0.5 * x
     w = 0.3 * x
 
 drawDragDrop :: Float -> Picture
-drawDragDrop x = 
-    line (fmap (+V2 z (-x)) [V2 (-x) x,V2 0 x,V2 0 (-x)])
-    <> line (fmap (+V2 z (-x)) [V2 (-y) (y-x), V2 0 (-x), V2 y (y-x)])
-    <> drawSelect 5
+drawDragDrop x =
+    line (fmap (+ V2 z (- x)) [V2 (- x) x, V2 0 x, V2 0 (- x)])
+        <> line (fmap (+ V2 z (- x)) [V2 (- y) (y - x), V2 0 (- x), V2 y (y - x)])
+        <> drawSelect 5
   where
     z = 1.5 * x
     y = 0.7 * x
 
 drawDragPickup :: Float -> Picture
-drawDragPickup x = 
-    line [V2 (-0.5 *x) 0, V2 (-z) 0, V2 (-z) z]
-    <> line [V2 (-(z+y)) (z-y), V2 (-z) z, V2 (y-z) (z-y)]
-    <> drawSelect 5
+drawDragPickup x =
+    line [V2 (-0.5 * x) 0, V2 (- z) 0, V2 (- z) z]
+        <> line [V2 (- (z + y)) (z - y), V2 (- z) z, V2 (y - z) (z - y)]
+        <> drawSelect 5
   where
     z = 1.5 * x
     y = 0.7 * x
@@ -207,18 +221,20 @@ drawDragPickup x =
 
 drawSelect :: Float -> Picture
 drawSelect x = polygonWire $ rectWH (0.5 * x) (0.5 * x)
+
 --    line [V2 (-x) 0, V2 0 0]
---drawSelect x = line 
+--drawSelect x = line
 --    [ V2 x x
 --    , V2 0 x
 --    , V2 0 (-x)
 --    , V2 x (-x)
---    ] <> 
+--    ] <>
 --    line [V2 (-x) 0, V2 0 0]
 
 drawCombFilter :: Float -> Picture
-drawCombFilter x = rotate (0.25*pi) 
-    $ fold [line [V2 (- x) 0, V2 x 0], line [V2 0 (- x), V2 0 0]]
+drawCombFilter x =
+    rotate (0.25 * pi) $
+        fold [line [V2 (- x) 0, V2 x 0], line [V2 0 (- x), V2 0 0]]
 
 --drawDoublePlus :: Float -> Picture
 --drawDoublePlus x = fold [line [V2 (- (1.5*x)) 0, V2 (1.5*x) 0]
@@ -238,9 +254,9 @@ drawGapPlus x =
 aimDelaySweep :: World -> Picture
 aimDelaySweep w = fold $ do
     cr <- w ^? cWorld . lWorld . creatures . ix 0
---    aimstatus <- cr ^? crStance . posture
---    guard (aimstatus == Aiming)
-    Aiming {} <- cr ^? crStance . posture
+    --    aimstatus <- cr ^? crStance . posture
+    --    guard (aimstatus == Aiming)
+    Aiming{} <- cr ^? crStance . posture
     return $ drawAimSweep cr w
 
 drawAimSweep :: Creature -> World -> Picture
diff --git a/src/Dodge/Render/ShapePicture.hs b/src/Dodge/Render/ShapePicture.hs
index 7393eb52b..2b4172945 100644
--- a/src/Dodge/Render/ShapePicture.hs
+++ b/src/Dodge/Render/ShapePicture.hs
@@ -5,13 +5,11 @@ module Dodge.Render.ShapePicture (
 import Control.Lens
 import Data.Foldable
 import Data.Strict.Tuple
-import Dodge.Base
 import Dodge.Creature.Picture
 import Dodge.Data.Universe
 import Dodge.Debug.Picture
 import Dodge.Draw
 import Dodge.RadarBlip
-import Dodge.Render.List
 import Dodge.Render.Picture
 import Geometry
 import qualified IntMapHelp as IM
@@ -99,16 +97,7 @@ extraPics cfig u =
         <> foldMap ppDraw (_pressPlates lw)
         <> viewClipBounds cfig w
         <> debugDraw cfig w
-        <> foldMap (`_debugPic` u) (_uvDebug u)
-        <> setLayer
-            FixedCoordLayer
-            ( toTopLeft cfig . translate (1.3 * halfWidth cfig) 0
-                . drawList
-                . take 50
-                . drop (u ^. uvDebugMessageOffset)
-                . map text
-                $ foldMap (`_debugMessage` u) (_uvDebug u)
-            )
+        <> foldMap (`_debugPic` u) (_uvDebug u) -- debug messages are in fixed coord pics
   where
     w = u ^. uvWorld
     lw = w ^. cWorld . lWorld
@@ -132,4 +121,3 @@ mcSPic :: LWorld -> Machine -> SPic
 mcSPic lw mc =
     uncurryV translateSPxy (_mcPos mc) $
         rotateSP (_mcDir mc) (drawMachine lw mc)
-
diff --git a/tags b/tags
index bde3f0570..fb7f95ce1 100644
--- a/tags
+++ b/tags
@@ -3387,8 +3387,8 @@ addZ	src/Geometry/Vector3D.hs	89;"	f
 adjustIMZone	src/Dodge/Base.hs	81;"	f
 advanceScrollAmount	src/Dodge/Update.hs	401;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	33;"	f
-advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	45;"	f
-aimDelaySweep	src/Dodge/Render/Picture.hs	238;"	f
+advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	44;"	f
+aimDelaySweep	src/Dodge/Render/Picture.hs	254;"	f
 aimStanceInfo	src/Dodge/Item/Info.hs	235;"	f
 aimTurn	src/Dodge/Creature/YourControl.hs	161;"	f
 aimingWeaponHandlePos	src/Dodge/Item/HeldOffset.hs	69;"	f
@@ -3579,7 +3579,7 @@ branchRectWith	src/Dodge/Room/Branch.hs	15;"	f
 branchWith	src/Dodge/Room/Room.hs	67;"	f
 bright	src/Color.hs	120;"	f
 brightX	src/Color.hs	116;"	f
-btSPic	src/Dodge/Render/ShapePicture.hs	126;"	f
+btSPic	src/Dodge/Render/ShapePicture.hs	115;"	f
 bufferEBO	src/Shader/Bind.hs	28;"	f
 bufferPokedVBO	src/Shader/Bind.hs	19;"	f
 bufferShaderLayers	src/Shader/Bind.hs	36;"	f
@@ -3767,9 +3767,9 @@ crIXsNearPoint	src/Dodge/Zoning/Creature.hs	13;"	f
 crInAimStance	src/Dodge/Creature/Test.hs	90;"	f
 crIsAiming	src/Dodge/Creature/Test.hs	56;"	f
 crIsArmouredFrom	src/Dodge/Creature/Test.hs	109;"	f
-crMvAbsolute	src/Dodge/Creature/Impulse/Movement.hs	20;"	f
-crMvBy	src/Dodge/Creature/Impulse/Movement.hs	13;"	f
-crMvForward	src/Dodge/Creature/Impulse/Movement.hs	38;"	f
+crMvAbsolute	src/Dodge/Creature/Impulse/Movement.hs	27;"	f
+crMvBy	src/Dodge/Creature/Impulse/Movement.hs	20;"	f
+crMvForward	src/Dodge/Creature/Impulse/Movement.hs	41;"	f
 crNearPoint	src/Dodge/Creature/Test.hs	135;"	f
 crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	22;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	85;"	f
@@ -3801,10 +3801,9 @@ createShieldWall	src/Dodge/Euse.hs	107;"	f
 createUnusedLinkPos	src/Dodge/Tree/Shift.hs	117;"	f
 createWall	src/Dodge/Wall/Create.hs	8;"	f
 creatureDisplayText	src/Dodge/Creature/Picture/Awareness.hs	10;"	f
-creatureTurn	src/Dodge/Creature/Impulse/Movement.hs	57;"	f
-creatureTurnTo	src/Dodge/Creature/Impulse/Movement.hs	60;"	f
-creatureTurnToward	src/Dodge/Creature/Impulse/Movement.hs	87;"	f
-creatureTurnTowardDir	src/Dodge/Creature/Impulse/Movement.hs	70;"	f
+creatureTurnTo	src/Dodge/Creature/Impulse/Movement.hs	52;"	f
+creatureTurnToward	src/Dodge/Creature/Impulse/Movement.hs	73;"	f
+creatureTurnTowardDir	src/Dodge/Creature/Impulse/Movement.hs	62;"	f
 critInDeadEnd	src/Dodge/Room/Room.hs	232;"	f
 crixsNearSeg	src/Dodge/Zoning/Creature.hs	26;"	f
 crossPic	src/Dodge/Render/Label.hs	27;"	f
@@ -3821,7 +3820,7 @@ crystalDebris	src/Dodge/Block/Debris.hs	176;"	f
 crystalLine	src/Dodge/Placement/Instance/Wall.hs	55;"	f
 crystalWallDamage	src/Dodge/Wall/DamageEffect.hs	79;"	f
 cubeShape	src/Dodge/Block/Debris.hs	196;"	f
-cullPoint	src/Dodge/Render/ShapePicture.hs	79;"	f
+cullPoint	src/Dodge/Render/ShapePicture.hs	77;"	f
 cullPretty	src/AesonHelp.hs	14;"	f
 curveAroundField	src/Dodge/Magnet.hs	18;"	f
 curveLeftField	src/Dodge/Magnet.hs	13;"	f
@@ -4010,7 +4009,7 @@ disconnectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	490;"	f
 disconnectTerminal	src/Dodge/Terminal.hs	217;"	f
 displayConfig	src/Dodge/Menu.hs	196;"	f
 displayControls	src/Dodge/Menu.hs	206;"	f
-displayFrameTicks	src/Dodge/Render/Picture.hs	38;"	f
+displayFrameTicks	src/Dodge/Render/Picture.hs	45;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	198;"	f
 displayIndents	src/Dodge/DisplayInventory.hs	110;"	f
 displayPulse	src/Dodge/Inventory/SelectionList.hs	173;"	f
@@ -4128,7 +4127,7 @@ doublePairSet	src/Geometry.hs	165;"	f
 doubleTreeToIndentList	src/Dodge/DoubleTree.hs	72;"	f
 doubleV2	src/Geometry.hs	168;"	f
 drawARHUD	src/Dodge/Creature/State.hs	302;"	f
-drawAimSweep	src/Dodge/Render/Picture.hs	246;"	f
+drawAimSweep	src/Dodge/Render/Picture.hs	262;"	f
 drawAllShadows	src/Dodge/Shadows.hs	5;"	f
 drawBaseMachine	src/Dodge/Machine/Draw.hs	57;"	f
 drawBeam	src/Dodge/Beam/Draw.hs	6;"	f
@@ -4140,13 +4139,13 @@ drawButton	src/Dodge/Button/Draw.hs	9;"	f
 drawCPUShadows	src/Dodge/Render/Shadow.hs	19;"	f
 drawCircCollisionTest	src/Dodge/Debug/Picture.hs	111;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	103;"	f
-drawCombFilter	src/Dodge/Render/Picture.hs	219;"	f
+drawCombFilter	src/Dodge/Render/Picture.hs	234;"	f
 drawCombineInventory	src/Dodge/Render/HUD.hs	179;"	f
-drawConcurrentMessage	src/Dodge/Render/Picture.hs	61;"	f
+drawConcurrentMessage	src/Dodge/Render/Picture.hs	68;"	f
 drawCoord	src/Dodge/Debug/Picture.hs	359;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
 drawCrInfo	src/Dodge/Debug/Picture.hs	380;"	f
-drawCreature	src/Dodge/Render/ShapePicture.hs	41;"	f
+drawCreature	src/Dodge/Render/ShapePicture.hs	39;"	f
 drawCreatureDisplayTexts	src/Dodge/Debug/Picture.hs	192;"	f
 drawCross	src/Dodge/Render/Label.hs	24;"	f
 drawCrossCol	src/Dodge/Render/Label.hs	21;"	f
@@ -4154,13 +4153,13 @@ drawCursorAt	src/Dodge/Render/List.hs	71;"	f
 drawDDATest	src/Dodge/Debug/Picture.hs	286;"	f
 drawDoorPaths	src/Dodge/Debug/Picture.hs	247;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	87;"	f
-drawDrag	src/Dodge/Render/Picture.hs	169;"	f
-drawDragDrop	src/Dodge/Render/Picture.hs	180;"	f
-drawDragPickup	src/Dodge/Render/Picture.hs	189;"	f
-drawDragSelect	src/Dodge/Render/Picture.hs	166;"	f
+drawDrag	src/Dodge/Render/Picture.hs	182;"	f
+drawDragDrop	src/Dodge/Render/Picture.hs	194;"	f
+drawDragPickup	src/Dodge/Render/Picture.hs	203;"	f
+drawDragSelect	src/Dodge/Render/Picture.hs	179;"	f
 drawDragSelected	src/Dodge/Render/HUD.hs	132;"	f
 drawDragSelecting	src/Dodge/Render/HUD.hs	149;"	f
-drawEmptySet	src/Dodge/Render/Picture.hs	116;"	f
+drawEmptySet	src/Dodge/Render/Picture.hs	123;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	10;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	142;"	f
 drawExamineInventory	src/Dodge/Render/HUD.hs	195;"	f
@@ -4169,7 +4168,7 @@ drawFlame	src/Dodge/Flame/Draw.hs	7;"	f
 drawFlamelet	src/Dodge/EnergyBall/Draw.hs	26;"	f
 drawFooterText	src/Dodge/Render/MenuScreen.hs	72;"	f
 drawForceField	src/Dodge/Wall/Draw.hs	11;"	f
-drawGapPlus	src/Dodge/Render/Picture.hs	229;"	f
+drawGapPlus	src/Dodge/Render/Picture.hs	245;"	f
 drawGib	src/Dodge/Prop/Draw.hs	31;"	f
 drawHUD	src/Dodge/Render/HUD.hs	48;"	f
 drawInputMenu	src/Dodge/Render/MenuScreen.hs	22;"	f
@@ -4178,7 +4177,7 @@ drawInspectWalls	src/Dodge/Debug/Picture.hs	227;"	f
 drawInventory	src/Dodge/Render/HUD.hs	55;"	f
 drawItemChildrenConnect	src/Dodge/Render/HUD.hs	326;"	f
 drawItemConnections	src/Dodge/Render/HUD.hs	316;"	f
-drawJumpDown	src/Dodge/Render/Picture.hs	162;"	f
+drawJumpDown	src/Dodge/Render/Picture.hs	174;"	f
 drawLabCrossCol	src/Dodge/Render/Label.hs	8;"	f
 drawLampCover	src/Dodge/Prop/Draw.hs	47;"	f
 drawLaser	src/Dodge/Laser/Draw.hs	6;"	f
@@ -4192,11 +4191,11 @@ drawListYoff	src/Dodge/Render/List.hs	92;"	f
 drawMachine	src/Dodge/Machine/Draw.hs	17;"	f
 drawMapperAR	src/Dodge/Targeting/Draw.hs	12;"	f
 drawMapperInventory	src/Dodge/Render/HUD.hs	169;"	f
-drawMenuClick	src/Dodge/Render/Picture.hs	136;"	f
-drawMenuCursor	src/Dodge/Render/Picture.hs	149;"	f
-drawMenuOrHUD	src/Dodge/Render/Picture.hs	56;"	f
+drawMenuClick	src/Dodge/Render/Picture.hs	146;"	f
+drawMenuCursor	src/Dodge/Render/Picture.hs	160;"	f
+drawMenuOrHUD	src/Dodge/Render/Picture.hs	63;"	f
 drawMenuScreen	src/Dodge/Render/MenuScreen.hs	16;"	f
-drawMouseCursor	src/Dodge/Render/Picture.hs	72;"	f
+drawMouseCursor	src/Dodge/Render/Picture.hs	79;"	f
 drawMouseOver	src/Dodge/Render/HUD.hs	103;"	f
 drawMousePosition	src/Dodge/Debug/Picture.hs	349;"	f
 drawMovingShape	src/Dodge/Prop/Draw.hs	73;"	f
@@ -4205,18 +4204,18 @@ drawOptions	src/Dodge/Render/MenuScreen.hs	36;"	f
 drawPathBetween	src/Dodge/Debug/Picture.hs	195;"	f
 drawPathEdge	src/Dodge/Debug/Picture.hs	252;"	f
 drawPathing	src/Dodge/Debug/Picture.hs	422;"	f
-drawPlus	src/Dodge/Render/Picture.hs	133;"	f
+drawPlus	src/Dodge/Render/Picture.hs	143;"	f
 drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	13;"	f
 drawProp	src/Dodge/Prop/Draw.hs	18;"	f
 drawRBOptions	src/Dodge/Render/HUD.hs	249;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	14;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	37;"	f
-drawReturn	src/Dodge/Render/Picture.hs	122;"	f
+drawReturn	src/Dodge/Render/Picture.hs	130;"	f
 drawRootCursor	src/Dodge/Render/HUD.hs	71;"	f
 drawSSCursor	src/Dodge/SelectionSections/Draw.hs	35;"	f
 drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	46;"	f
-drawSelect	src/Dodge/Render/Picture.hs	208;"	f
+drawSelect	src/Dodge/Render/Picture.hs	222;"	f
 drawSelectionList	src/Dodge/Render/List.hs	35;"	f
 drawSelectionListBackground	src/Dodge/Render/List.hs	51;"	f
 drawSelectionSections	src/Dodge/SelectionSections/Draw.hs	16;"	f
@@ -4294,7 +4293,6 @@ equipInfo	src/Dodge/Item/Info.hs	134;"	f
 equipItemSPic	src/Dodge/Item/Draw/SPic.hs	144;"	f
 equipPosition	src/Dodge/Item/Draw.hs	28;"	f
 equipSiteInfo	src/Dodge/Item/Info.hs	245;"	f
-equipSpeed	src/Dodge/Creature/Impulse/Movement.hs	99;"	f
 equipmentStrValue	src/Dodge/Creature/Statistics.hs	20;"	f
 errorAngleVV	src/Geometry.hs	59;"	f
 errorClosestPointOnLine	src/Geometry.hs	71;"	f
@@ -4319,7 +4317,7 @@ explosiveBarrel	src/Dodge/Creature/Inanimate.hs	29;"	f
 extTrigLitPos	src/Dodge/Placement/Instance/Button.hs	84;"	f
 extendAway	src/Dodge/Placement/Instance/LightSource.hs	200;"	f
 extendConeToScreenEdge	src/Dodge/Debug/Picture.hs	82;"	f
-extraPics	src/Dodge/Render/ShapePicture.hs	84;"	f
+extraPics	src/Dodge/Render/ShapePicture.hs	82;"	f
 extraWeaponLinks	src/Dodge/Item/Grammar.hs	117;"	f
 extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	126;"	f
 extractRoomPos	src/Dodge/RoomPos.hs	6;"	f
@@ -4380,7 +4378,7 @@ flockPointTargetR	src/Dodge/Creature/Boid.hs	266;"	f
 flockToPointUsing	src/Dodge/Creature/Boid.hs	214;"	f
 flockToPointUsing'	src/Dodge/Creature/Boid.hs	227;"	f
 floorItemPickupInfo	src/Dodge/Render/HUD.hs	228;"	f
-floorItemSPic	src/Dodge/Render/ShapePicture.hs	119;"	f
+floorItemSPic	src/Dodge/Render/ShapePicture.hs	108;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	418;"	f
 foamSprayLoopS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	414;"	f
@@ -4399,7 +4397,7 @@ forceField	src/Dodge/Wall/ForceField.hs	7;"	f
 forceFoldable	src/StrictHelp.hs	7;"	f
 forceSpine	src/StrictHelp.hs	4;"	f
 fourEmbossDecoration	src/Dodge/Placement/TopDecoration.hs	29;"	f
-fpsText	src/Dodge/Render/Picture.hs	46;"	f
+fpsText	src/Dodge/Render/Picture.hs	53;"	f
 fractionLoadedAmmo	src/Dodge/Item/Draw/SPic.hs	137;"	f
 frag	src/Shader/Data.hs	102;"	f
 freeShaderPointers'	src/Shader.hs	37;"	f
@@ -4762,7 +4760,7 @@ lShape	src/Dodge/Placement/Instance/LightSource.hs	76;"	f
 lamp	src/Dodge/Creature/Lamp.hs	22;"	f
 lampCover	src/Dodge/Placement/Instance/LightSource/Cover.hs	8;"	f
 lampCoverWhen	src/Dodge/Placement/Instance/LightSource/Cover.hs	19;"	f
-lampCrSPic	src/Dodge/Render/ShapePicture.hs	58;"	f
+lampCrSPic	src/Dodge/Render/ShapePicture.hs	56;"	f
 lasCenSensEdge	src/Dodge/Room/LasTurret.hs	114;"	f
 lasDronesPic	src/Dodge/Item/Weapon/Drone.hs	22;"	f
 lasGunPic	src/Dodge/Item/Draw/SPic.hs	405;"	f
@@ -4960,7 +4958,7 @@ mcKillTerm	src/Dodge/Machine/Destroy.hs	26;"	f
 mcPlaySound	src/Dodge/Machine/Update.hs	98;"	f
 mcProxTest	src/Dodge/Machine/Update.hs	146;"	f
 mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	124;"	f
-mcSPic	src/Dodge/Render/ShapePicture.hs	131;"	f
+mcSPic	src/Dodge/Render/ShapePicture.hs	120;"	f
 mcSensorTriggerUpdate	src/Dodge/Machine/Update.hs	87;"	f
 mcSensorUpdate	src/Dodge/Machine/Update.hs	119;"	f
 mcShootAuto	src/Dodge/HeldUse.hs	628;"	f
@@ -5034,7 +5032,7 @@ mntLight	src/Dodge/Placement/Instance/LightSource.hs	158;"	f
 mntLightLnkCond	src/Dodge/Placement/Instance/LightSource.hs	163;"	f
 modTo	src/Geometry/Zone.hs	10;"	f
 mouseClickOptionsList	src/Dodge/Update/Input/ScreenLayer.hs	59;"	f
-mouseCursorType	src/Dodge/Render/Picture.hs	79;"	f
+mouseCursorType	src/Dodge/Render/Picture.hs	86;"	f
 mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
 moveBullet	src/Dodge/Bullet.hs	187;"	f
 moveCombineSel	src/Dodge/Update/Scroll.hs	112;"	f
@@ -5192,7 +5190,7 @@ pesNearCirc	src/Dodge/Zoning/Pathing.hs	43;"	f
 pesNearPoint	src/Dodge/Zoning/Pathing.hs	33;"	f
 pesNearRect	src/Dodge/Zoning/Pathing.hs	40;"	f
 pesNearSeg	src/Dodge/Zoning/Pathing.hs	37;"	f
-picAtCrPos1	src/Dodge/Render/ShapePicture.hs	63;"	f
+picAtCrPos1	src/Dodge/Render/ShapePicture.hs	61;"	f
 picFormat	src/Polyhedra.hs	23;"	f
 picMap	src/Picture/Base.hs	67;"	f
 pickUpItem	src/Dodge/Inventory/Add.hs	107;"	f
@@ -5327,7 +5325,7 @@ powlist	src/Multiset.hs	61;"	f
 powlistUpToN	src/Multiset.hs	23;"	f
 powlistUpToN'	src/Multiset.hs	12;"	f
 powlistUpToN''	src/Multiset.hs	31;"	f
-ppDraw	src/Dodge/Render/ShapePicture.hs	116;"	f
+ppDraw	src/Dodge/Render/ShapePicture.hs	105;"	f
 ppEvents	src/Dodge/Update.hs	677;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
@@ -5733,8 +5731,8 @@ shellTrailCloud	src/Dodge/WorldEvent/Cloud.hs	65;"	f
 shieldWall	src/Dodge/Euse.hs	87;"	f
 shiftByV2	src/Dodge/PlacementSpot.hs	239;"	f
 shiftChildren	src/Dodge/Tree/Compose.hs	43;"	f
-shiftDraw	src/Dodge/Render/ShapePicture.hs	67;"	f
-shiftDraw'	src/Dodge/Render/ShapePicture.hs	73;"	f
+shiftDraw	src/Dodge/Render/ShapePicture.hs	65;"	f
+shiftDraw'	src/Dodge/Render/ShapePicture.hs	71;"	f
 shiftInBy	src/Dodge/PlacementSpot.hs	236;"	f
 shiftInvItems	src/Dodge/Update/Input/InGame.hs	306;"	f
 shiftInvItemsDown	src/Dodge/Update/Input/InGame.hs	345;"	f
@@ -5918,7 +5916,7 @@ stopPushing	src/Dodge/Block.hs	107;"	f
 stopSoundFrom	src/Dodge/SoundLogic.hs	206;"	f
 strFromEquipment	src/Dodge/Creature/Statistics.hs	17;"	f
 strFromHeldItem	src/Dodge/Creature/Statistics.hs	29;"	f
-strengthFactor	src/Dodge/Creature/Impulse/Movement.hs	32;"	f
+strengthFactor	src/Dodge/Creature/Impulse/Movement.hs	35;"	f
 strictify	src/MaybeHelp.hs	37;"	f
 strideRot	src/Dodge/Item/HeldOffset.hs	83;"	f
 stringToList	src/Picture/Base.hs	313;"	f
@@ -6408,7 +6406,7 @@ wlsNearRect	src/Dodge/Zoning/Wall.hs	46;"	f
 wlsNearSeg	src/Dodge/Zoning/Wall.hs	42;"	f
 wordsBy	src/ListHelp.hs	116;"	f
 worldPosToScreen	src/Dodge/Base/Coordinate.hs	28;"	f
-worldSPic	src/Dodge/Render/ShapePicture.hs	23;"	f
+worldSPic	src/Dodge/Render/ShapePicture.hs	21;"	f
 worldToGenWorld	src/Dodge/LevelGen/LevelStructure.hs	14;"	f
 wpAdd	src/Dodge/Room/RezBox.hs	137;"	f
 wrench1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	408;"	f