diff --git a/src/Dodge/Creature/Damage.hs b/src/Dodge/Creature/Damage.hs
index 77b82d1d7..fc53fb40e 100644
--- a/src/Dodge/Creature/Damage.hs
+++ b/src/Dodge/Creature/Damage.hs
@@ -44,7 +44,7 @@ applyDamageEffect dm de cr w = case de of
         & creatures . ix (_crID cr) . crDir +~ rot
     BounceBullet bt | crIsArmouredFrom p cr -> w & instantBullets .:~ bouncer
       where
-        bouncer = (aBulAt Nothing id (Just (_buColor bt)) pOut reflectVel (_buDrag bt)
+        bouncer = (aBulAt Nothing id pOut reflectVel (_buDrag bt)
                                           (_buHitEff bt) (_buWidth bt)
                   ) {_buTimer = _buTimer bt - 1}
         pOut = p +.+ 2 *.* newDir
diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs
index 53205587f..c3be7a06e 100644
--- a/src/Dodge/Data.hs
+++ b/src/Dodge/Data.hs
@@ -528,8 +528,8 @@ data Bullet = Bullet
     { _buUpdate :: World -> Bullet -> (World, Maybe Bullet)
     , _buVel    :: Point2
     , _buDrag   :: Float
-    , _buColor  :: Color
-    , _buTrail  :: [Point2]
+    , _buPos    :: Point2
+    , _buOldPos :: Point2
     , _buWidth  :: Float 
     , _buTimer  :: Int
     , _buHitEff :: HitEffect'
diff --git a/src/Dodge/Item/Weapon/AmmoParams.hs b/src/Dodge/Item/Weapon/AmmoParams.hs
index d4f26da8c..80c9713e6 100644
--- a/src/Dodge/Item/Weapon/AmmoParams.hs
+++ b/src/Dodge/Item/Weapon/AmmoParams.hs
@@ -18,7 +18,6 @@ useAmmoParams :: Maybe Float -> Item -> Creature -> World -> World
 useAmmoParams vfact it cr w = w & instantBullets .:~ aBulAt 
     vfact 
     thetraj                     -- extra update
-    Nothing                     -- color (default)
     sp
     (rotateV dir (muzvel *.* _amBulVel bultype))           -- vel
     (_rifling $ _itParams it)   -- drag
@@ -34,10 +33,10 @@ useAmmoParams vfact it cr w = w & instantBullets .:~ aBulAt
         BasicBulletTrajectory -> id
         MagnetTrajectory -> fromMaybe id $ do
             tpos <- it ^? itTargeting . tgPos . _Just
-            return $ \pt -> pt & buVel .+.+~ 5 *.* normalizeV (tpos -.- head (_buTrail pt))
+            return $ \pt -> pt & buVel .+.+~ 5 *.* normalizeV (tpos -.- _buPos pt)
         FlechetteTrajectory -> fromMaybe id $ do
             tpos <- it ^? itTargeting . tgPos . _Just
-            return $ \pt -> pt & buVel %~ vecTurnTo 0.2 (head $ _buTrail pt) tpos
+            return $ \pt -> pt & buVel %~ vecTurnTo 0.2 (_buPos pt) tpos
         BezierTrajectory -> fromMaybe id $ do
             tpos <- it ^? itTargeting . tgPos . _Just
             let bf t = bQuadToF (sp,mouseWorldPos w,tpos) $ (100 - t) * 0.05
diff --git a/src/Dodge/Magnet.hs b/src/Dodge/Magnet.hs
index 95c695737..3837cf2b5 100644
--- a/src/Dodge/Magnet.hs
+++ b/src/Dodge/Magnet.hs
@@ -6,12 +6,12 @@ import Control.Lens
 
 dampField :: Magnet -> Bullet -> Bullet
 dampField mg pt = case pt of
-    Bullet{} | dist (head $ _buTrail pt) (_mgPos mg) < 100 -> pt & buVel *~ 0.5
+    Bullet{} | dist (_buPos pt) (_mgPos mg) < 100 -> pt & buVel *~ 0.5
     _ -> pt
 
 curveLeftField :: Magnet -> Bullet -> Bullet
 curveLeftField mg pt = case pt of
-    Bullet{} | dist (head $ _buTrail pt) (_mgPos mg) < 500 -> pt & buVel %~ rotateV 0.2
+    Bullet{} | dist (_buPos pt) (_mgPos mg) < 500 -> pt & buVel %~ rotateV 0.2
     _ -> pt
 
 curveAroundField :: Float -> Float -> Magnet -> Bullet -> Bullet
@@ -20,7 +20,7 @@ curveAroundField minrad maxrad mg pt = case pt of
       where
         thedist = dist btpos mgpos
         mgpos = _mgPos mg
-        btpos = head $ _buTrail pt
+        btpos = _buPos pt
         rotateToCircle vel 
             | (isLHS mgpos btpos (btpos +.+ vel) && isRHS mgpos btpos (mgpos +.+ vNormal vel) )
               || (isRHS mgpos btpos (btpos +.+ vel) && isLHS mgpos btpos (mgpos +.+ vNormal vel) )
diff --git a/src/Dodge/Particle/Bullet/Draw.hs b/src/Dodge/Particle/Bullet/Draw.hs
index 48c1b7360..374ea8760 100644
--- a/src/Dodge/Particle/Bullet/Draw.hs
+++ b/src/Dodge/Particle/Bullet/Draw.hs
@@ -4,9 +4,10 @@ module Dodge.Particle.Bullet.Draw
 import Dodge.Data
 import Picture
 
+import Linear
+
 drawBul :: Bullet -> Picture
 drawBul pt = setLayer BloomNoZWrite
     . setDepth 20 
-    . color (_buColor pt) 
-    -- $ thickLine (_ptWidth pt) (take 3 $ _ptTrail pt)
-    $ thickLine (_buWidth pt) (take 2 $ _buTrail pt)
+    . color (V4 200 200 200 2)
+    $ thickLine (_buWidth pt) [_buOldPos pt, _buPos pt]
diff --git a/src/Dodge/Particle/Bullet/Spawn.hs b/src/Dodge/Particle/Bullet/Spawn.hs
index cb9d478a4..e7d23ace6 100644
--- a/src/Dodge/Particle/Bullet/Spawn.hs
+++ b/src/Dodge/Particle/Bullet/Spawn.hs
@@ -4,7 +4,6 @@ module Dodge.Particle.Bullet.Spawn
 import Dodge.Data
 import Dodge.Particle.Bullet.Update
 import Geometry
-import Picture
 import LensHelp
 
 import Data.Maybe
@@ -13,19 +12,18 @@ import Data.Bifunctor
 aBulAt
     :: Maybe Float    -- ^ Start velocity step factor
     -> (Bullet -> Bullet)
-    -> Maybe Color
     -> Point2   -- ^ Start position
     -> Point2  -- ^ Velocity
     -> Float    -- ^ Drag
     -> HitEffect' 
     -> Float    -- ^ Bullet width
     -> Bullet
-aBulAt vfact updatemod mcol pos vel drag hiteff width = Bullet
+aBulAt vfact updatemod pos vel drag hiteff width = Bullet
     { _buUpdate = theupdate
     , _buVel  = fromMaybe 1 vfact *.* vel
     , _buDrag = drag
-    , _buColor = fromMaybe (V4 200 200 200 2) mcol
-    , _buTrail = [pos]
+    , _buPos = pos
+    , _buOldPos = pos
     , _buWidth = width
     , _buTimer = 100
     , _buHitEff = hiteff
diff --git a/src/Dodge/Particle/Bullet/Update.hs b/src/Dodge/Particle/Bullet/Update.hs
index a816576d4..32dbce577 100644
--- a/src/Dodge/Particle/Bullet/Update.hs
+++ b/src/Dodge/Particle/Bullet/Update.hs
@@ -22,7 +22,7 @@ mvBullet w bt'
     bt = foldr (\mg b -> _mgField mg mg b) bt' $ _magnets w
     dodrag = buVel .*.*~ drag
     drag = _buDrag bt
-    (p:_)   = _buTrail bt
+    p       = _buPos bt
     vel     = _buVel bt
     hiteff  = _buHitEff bt
     t       = _buTimer bt
diff --git a/src/Dodge/Particle/Damage.hs b/src/Dodge/Particle/Damage.hs
index 33ff5d849..b636c6055 100644
--- a/src/Dodge/Particle/Damage.hs
+++ b/src/Dodge/Particle/Damage.hs
@@ -1,7 +1,7 @@
 module Dodge.Particle.Damage where
 import Dodge.Data
 import Geometry
-import LensHelp
+--import LensHelp
 
 import System.Random
 import Control.Monad.State
@@ -14,7 +14,7 @@ spawnAtBulDams thespawn bt p =
     , Damage PUSHDAM   1 sp p ep . PushBackDamage $ 2 *.* bulVel
     ]
   where
-    sp = head $ _buTrail bt
+    sp = _buPos bt
     bulVel = _buVel bt
     ep = sp +.+ bulVel
 
@@ -27,9 +27,7 @@ simpleDam dt amount bt p = [ Damage dt amount sp p ep NoDamageEffect ]
 simpleDam' :: DamageType -> Int -> Bullet -> Point2 -> [Damage]
 simpleDam' dt amount bt p = [ Damage dt amount sp p ep NoDamageEffect ]
   where
-    sp = case bt ^? buTrail of
-        Nothing -> 0
-        Just xs -> head xs
+    sp = _buPos bt
     bulVel = _buVel bt
     ep = sp +.+ bulVel
 
@@ -39,7 +37,7 @@ heavyBulDams bt p =
     , Damage PUSHDAM    1 sp p ep . PushBackDamage $ 2 *.* bulVel
     ]
   where
-    sp = head $ _buTrail bt
+    sp = _buPos bt
     bulVel = _buVel bt
     ep = sp +.+ bulVel
 
@@ -49,7 +47,7 @@ basicBulDams bt p =
     , Damage PUSHDAM    1 sp p ep . PushBackDamage $ 2 *.* bulVel
     ]
   where
-    sp = head $ _buTrail bt
+    sp = _buPos bt
     bulVel = _buVel bt
     ep = sp +.+ bulVel
 
@@ -72,7 +70,7 @@ hvBulDams bt p =
     , Damage PUSHDAM    1 sp p ep . PushBackDamage $ 3 *.* (ep -.- sp)
     ] 
   where
-    sp = head $ _buTrail bt
+    sp = _buPos bt
     bulVel = _buVel bt
     ep = sp +.+ bulVel
 
@@ -82,6 +80,6 @@ bounceBulDams bt p =
     , Damage PUSHDAM   1 sp p ep . PushBackDamage $ 2 *.* bulVel
     ]
   where
-    sp = head $ _buTrail bt
+    sp = _buPos bt
     bulVel = _buVel bt
     ep = sp +.+ bulVel
diff --git a/src/Dodge/Particle/Draw.hs b/src/Dodge/Particle/Draw.hs
index 9d59215a9..d0bcf1daa 100644
--- a/src/Dodge/Particle/Draw.hs
+++ b/src/Dodge/Particle/Draw.hs
@@ -124,18 +124,10 @@ drawInverseShockwave  pt
     rad = r - 0.1 * r * fromIntegral (10 - t)
     thickness = fromIntegral (10 - t) **2 * rad / 40
 
-drawBul :: Bullet -> Picture
-drawBul pt = setLayer BloomNoZWrite
-    . setDepth 20 
-    . color (_buColor pt) 
-    -- $ thickLine (_ptWidth pt) (take 3 $ _ptTrail pt)
-    $ thickLine (_buWidth pt) (take 2 $ _buTrail pt)
-
 drawSpark :: Particle -> Picture
 drawSpark pt = setLayer BloomNoZWrite
     . setDepth 20 
     . color (_ptColor pt) 
-    -- $ thickLine (_ptWidth pt) (take 3 $ _ptTrail pt)
     $ thickLine (_ptWidth pt) (take 2 $ _ptTrail pt)
 
 drawTeslaArc :: Particle -> Picture
diff --git a/src/Dodge/Particle/Update.hs b/src/Dodge/Particle/Update.hs
index e529dbdd4..769c12d53 100644
--- a/src/Dodge/Particle/Update.hs
+++ b/src/Dodge/Particle/Update.hs
@@ -5,10 +5,9 @@ import Geometry
 
 mvPt :: Bullet -> Maybe Bullet
 mvPt pt = Just $ pt
-    & buTrail %~ f
+    & buPos %~ (+.+ _buVel pt)
+    & buOldPos .~ _buPos pt
     & buTimer -~ 1
-  where
-    f trl = head trl +.+ _buVel pt : trl
 
 mvPt' :: Particle -> Maybe Particle
 mvPt' pt = Just $ pt
@@ -24,17 +23,10 @@ destroyAt hitp pt = Just $ pt
     & ptTimer %~ (min 3 . subtract 1)
 destroyAt' :: Point2 -> Bullet -> Maybe Bullet
 destroyAt' hitp pt = Just $ pt 
-    & buUpdate .~ killBulletUpdate
-    & buTrail  .:~ hitp
-    & buTimer %~ (min 3 . subtract 1)
-
-killBulletUpdate :: World -> Bullet -> (World,Maybe Bullet)
-killBulletUpdate w pt 
-    | _buTimer pt <= 0 = (w,Nothing)
-    | otherwise = (w
-        , Just $ pt & buTimer -~ 1
-            & buTrail %~ (\(x:xs) -> x:x:xs)
-        )
+    & buUpdate  .~ (\w -> const (w,Nothing))
+    & buPos     .~ hitp
+    & buOldPos  .~ _buPos pt
+    & buTimer   %~ (min 3 . subtract 1)
 
 killParticleUpdate :: World -> Particle -> (World,Maybe Particle)
 killParticleUpdate w pt 
diff --git a/src/Dodge/Render/ShapePicture.hs b/src/Dodge/Render/ShapePicture.hs
index 292371bb9..f53999348 100644
--- a/src/Dodge/Render/ShapePicture.hs
+++ b/src/Dodge/Render/ShapePicture.hs
@@ -5,6 +5,7 @@ import Dodge.Item.Draw.SPic
 import Dodge.Creature.Picture.Awareness
 import Dodge.Creature.Picture
 import Dodge.Particle.Draw
+import Dodge.Particle.Bullet.Draw
 import Dodge.RadarBlip
 import Dodge.Flare
 import Dodge.ShortShow
diff --git a/src/Dodge/Wall/DamageEffect.hs b/src/Dodge/Wall/DamageEffect.hs
index cd5ecdfe1..6dd1a4495 100644
--- a/src/Dodge/Wall/DamageEffect.hs
+++ b/src/Dodge/Wall/DamageEffect.hs
@@ -106,7 +106,6 @@ crystalWallDamage dm wl = case _dmType dm of
     pSparkCol = V4 5 1 0.5 2
     lSparkCol = V4 20 (-5) 0 1
 
-
 dirtWallDamage :: Damage -> Wall -> World -> (World,Int)
 dirtWallDamage dm wl = case _dmType dm of
     LASERING    -> a d $ wlDustAt wl outTo
@@ -136,7 +135,7 @@ wallDamageEffect dm wl w = case _dmEffect dm of
     BounceBullet bt -> w & instantBullets .:~ thebouncer
       where
         reflectVel = reflVelWall wl (_buVel bt)
-        thebouncer = aBulAt Nothing id (Just (_buColor bt)) pOut reflectVel (_buDrag bt) (_buHitEff bt) (_buWidth bt)
+        thebouncer = aBulAt Nothing id pOut reflectVel (_buDrag bt) (_buHitEff bt) (_buWidth bt)
             & buTimer .~ _buTimer bt - 1
         pOut = p +.+ squashNormalizeV (sp -.- p)
         p = _dmAt dm