diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs
index ade4bb244..efbbf919c 100644
--- a/src/Dodge/Data.hs
+++ b/src/Dodge/Data.hs
@@ -299,18 +299,16 @@ data World = World
     , _lSelect          :: Point2
     , _rSelect          :: Point2
     }
---  deriving (Eq,Show,Read)
-data WorldHammer
-    = SubInvHam
-    | DoubleMouseHam
-  deriving (Eq,Ord,Show,Read,Enum,Bounded)
-
-
+  --deriving (Eq,Show,Read)
 data TimeFlowStatus
     = RewindingNow
     | RewindingLastFrame
     | NormalTimeFlow
   deriving (Eq,Ord,Show,Read)
+data WorldHammer
+    = SubInvHam
+    | DoubleMouseHam
+  deriving (Eq,Ord,Show,Read,Enum,Bounded)
 
 data SaveSlot = QuicksaveSlot | LevelStartSlot
   deriving (Eq,Ord,Show,Read)
diff --git a/src/Dodge/Data/Bounds.hs b/src/Dodge/Data/Bounds.hs
index 775d4168f..eab2bf216 100644
--- a/src/Dodge/Data/Bounds.hs
+++ b/src/Dodge/Data/Bounds.hs
@@ -10,6 +10,7 @@ data Bounds = Bounds
     , _bdMinY            :: Float
     , _bdMaxY            :: Float
     }
+  deriving (Eq,Ord,Show,Read)
 defaultBounds :: Bounds
 defaultBounds = Bounds 0 0 0 0
 
diff --git a/src/Dodge/Data/Button.hs b/src/Dodge/Data/Button.hs
index 1fc76102c..cd0518f1e 100644
--- a/src/Dodge/Data/Button.hs
+++ b/src/Dodge/Data/Button.hs
@@ -10,6 +10,7 @@ import Color
 data ButtonDraw = DefaultDrawButton Color
     | DefaultDrawSwitch Color Color
     | DrawNoButton
+  deriving (Eq,Ord,Show,Read)
 data ButtonEvent = ButtonDoNothing
     | ButtonPress
         {_bpState :: ButtonState
@@ -32,6 +33,7 @@ data ButtonEvent = ButtonDoNothing
         ,_boffEff :: WdWd
         }
     | ButtonAccessTerminal
+  deriving (Eq,Ord,Show,Read)
 
 data Button = Button 
     { _btPict   :: ButtonDraw --Button -> SPic
@@ -45,6 +47,8 @@ data Button = Button
     , _btName   :: String
     , _btColor  :: Color
     }
+  deriving (Eq,Ord,Show,Read)
 data ButtonState = BtOn | BtOff | BtNoLabel
-  deriving (Eq, Show)
+  deriving (Eq,Ord,Show,Read)
 makeLenses ''Button
+makeLenses ''ButtonEvent
diff --git a/src/Dodge/Data/LightSource.hs b/src/Dodge/Data/LightSource.hs
index c20e1b331..928e9d6ff 100644
--- a/src/Dodge/Data/LightSource.hs
+++ b/src/Dodge/Data/LightSource.hs
@@ -5,30 +5,33 @@ import Geometry
 import Control.Lens
 
 data LightSourceDraw = DefaultLightSourceDraw
-
+  deriving (Eq,Ord,Show,Read)
 data TLSIntensity = ConstantIntensity
     | TLSFade Point3 Int
-
+  deriving (Eq,Ord,Show,Read)
 data TLSUpdate = DestroyTLS
     | TimerTLS
     | IntensityTLS TLSIntensity
-
+  deriving (Eq,Ord,Show,Read)
 data LSParam = LSParam
     { _lsPos        :: !Point3
     , _lsRad        :: !Float
     , _lsCol        :: !Point3
     }
+  deriving (Eq,Ord,Show,Read)
 data LightSource = LS  
     { _lsID     :: Int
     , _lsParam  :: LSParam
     , _lsDir    :: Float
     , _lsPict   :: LightSourceDraw --LightSource -> Picture
     }
+  deriving (Eq,Ord,Show,Read)
 data TempLightSource = TLS 
     { _tlsParam     :: LSParam
     , _tlsUpdate    :: TLSUpdate --TempLightSource -> Maybe TempLightSource
     , _tlsTime      :: Int
     }
+  deriving (Eq,Ord,Show,Read)
 makeLenses ''LSParam
 makeLenses ''LightSource
 makeLenses ''TempLightSource
diff --git a/src/Dodge/Data/Modification.hs b/src/Dodge/Data/Modification.hs
index 0882feef9..89e3352ea 100644
--- a/src/Dodge/Data/Modification.hs
+++ b/src/Dodge/Data/Modification.hs
@@ -22,4 +22,5 @@ data Modification
         , _mdExternalID2 :: Int
         , _mdUpdate :: MdWdWd
         }
+  deriving (Eq,Ord,Show,Read)
 makeLenses ''Modification
diff --git a/src/Dodge/Data/RightButtonOptions.hs b/src/Dodge/Data/RightButtonOptions.hs
index c14dcd368..2b242dcb3 100644
--- a/src/Dodge/Data/RightButtonOptions.hs
+++ b/src/Dodge/Data/RightButtonOptions.hs
@@ -13,11 +13,13 @@ data RightButtonOptions
         ,_opAllocateEquipment :: AllocateEquipment
         ,_opActivateEquipment :: ActivateEquipment
         }
+  deriving (Eq,Ord,Show,Read)
 data ActivateEquipment
     = ActivateEquipment {_activateEquipment :: Int }
     | DeactivateEquipment {_deactivateEquipment :: Int}
     | ActivateDeactivateEquipment {_activateEquipment :: Int ,_deactivateEquipment :: Int}
     | NoChangeActivateEquipment
+  deriving (Eq,Ord,Show,Read)
 data AllocateEquipment 
     = DoNotMoveEquipment
     | PutOnEquipment
@@ -39,6 +41,7 @@ data AllocateEquipment
     | RemoveEquipment
         { _allocOldPos  :: EquipPosition
         }
+  deriving (Eq,Ord,Show,Read)
 makeLenses ''RightButtonOptions
 makeLenses ''AllocateEquipment
 makeLenses ''ActivateEquipment
diff --git a/src/Dodge/Distortion/Data.hs b/src/Dodge/Distortion/Data.hs
index 89531f963..578fa9782 100644
--- a/src/Dodge/Distortion/Data.hs
+++ b/src/Dodge/Distortion/Data.hs
@@ -5,3 +5,4 @@ import Geometry
 
 data Distortion 
     = RadialDistortion Point2 Point2 Point2 Float
+  deriving (Eq,Ord,Show,Read)
diff --git a/src/Dodge/Placement/Instance/Block.hs b/src/Dodge/Placement/Instance/Block.hs
index c41612b26..c93aec1a0 100644
--- a/src/Dodge/Placement/Instance/Block.hs
+++ b/src/Dodge/Placement/Instance/Block.hs
@@ -3,8 +3,6 @@ import Dodge.Data
 import Geometry
 import Color
 import LensHelp
-import ShapePicture
-import Shape
 import Dodge.Default.Wall
 import Dodge.Default.Block