diff --git a/README b/README
deleted file mode 100644
--- a/README
+++ /dev/null
@@ -1,5 +0,0 @@
-To build with sse2 support (core2 and other intels)
-
-    $ runhaskell Setup.lhs -f use_sse2
-
-Similar flags for altivec on the mac
diff --git a/System/Random/Mersenne.hs b/System/Random/Mersenne.hs
--- a/System/Random/Mersenne.hs
+++ b/System/Random/Mersenne.hs
@@ -57,12 +57,12 @@
 import System.CPUTime	( getCPUTime )
 import System.Time
 import System.IO.Unsafe
-import Control.Monad
+-- import Control.Monad
 
 import Data.Word
 import Data.Int
 import Data.Bits
-import Data.Char
+-- import Data.Char
 import Data.IORef
 
 ------------------------------------------------------------------------
diff --git a/TODO b/TODO
deleted file mode 100644
--- a/TODO
+++ /dev/null
@@ -1,28 +0,0 @@
-
--- support mulitple generators
-
-    Want to save the state, and later continue the generation.
-    In the case of mt19937ar.c, if one saves mt[N] (624 words) and the
-    counter mti (1 word), then one can continue the computation by loading
-    these values.
-
-    * too much copying...
-    * supporting multiple, impure generators is possible though.
-
-
--- Also provide a RandomGen instance
-
--- eager evaluation
-    -- fill arrays in chunks
-    -- possible api for this?
-
--- support fast range bounds
-    -- too slow on haskell side currently.
-
--- statistical correctness, DieHard suite.
-    -- too complex.
-
--- coverage tests
-    -- fixed in head.
-
--- move to .Unsafe
diff --git a/mersenne-random.cabal b/mersenne-random.cabal
--- a/mersenne-random.cabal
+++ b/mersenne-random.cabal
@@ -1,5 +1,5 @@
 name:            mersenne-random
-version:         1.0
+version:         1.0.0.1
 homepage:        http://code.haskell.org/~dons/code/mersenne-random
 synopsis:        Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister
 description:
@@ -36,11 +36,11 @@
 category:        Math, System
 license:         BSD3
 license-file:    LICENSE
-copyright:       (c) 2008. Don Stewart <dons@galois.com>
+copyright:       (c) 2008-2011. Don Stewart <dons00@gmail.com>
 author:          Don Stewart
-maintainer:      Don Stewart <dons@galois.com>
+maintainer:      Don Stewart <dons00@gmail.com>
 cabal-version: >= 1.2.0
-tested-with:     GHC ==6.8.2, Hugs ==2005
+tested-with:     GHC ==6.8.2, Hugs ==2005, GHC ==7.0.2
 build-type:      Simple
 
 flag small_base
@@ -66,7 +66,7 @@
     if flag(small_base)
         build-depends: base  < 3
     else
-        build-depends: base >= 3, old-time
+        build-depends: base >= 3 && < 5, old-time
 
     -- For information on how to set different periods, or tune 
     -- for your arch, see,
@@ -103,7 +103,7 @@
         cc-options:
             -DHAVE_ALTIVEC
 
-    ghc-options:     -Wall -O2 -fvia-C -fexcess-precision
+    ghc-options:     -Wall -O2 -fexcess-precision
 
     c-sources:        cbits/SFMT.c cbits/SFMT_wrap.c
     include-dirs:     include
diff --git a/readme b/readme
new file mode 100644
--- /dev/null
+++ b/readme
@@ -0,0 +1,5 @@
+To build with sse2 support (core2 and other intels)
+
+    $ runhaskell Setup.lhs -f use_sse2
+
+Similar flags for altivec on the mac
diff --git a/tests/pi.hs b/tests/pi.hs
--- a/tests/pi.hs
+++ b/tests/pi.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -cpp -fglasgow-exts -fvia-C -optc-O2 -optc-msse2 -optc-march=pentium4 -optc-ffast-math -fexcess-precision #-}
+{- OPTIONS -cpp -fglasgow-exts -fvia-C -optc-O2 -optc-msse2 -optc-march=core2 -optc-ffast-math -fexcess-precision -}
 
 #if defined(FAST)
 import System.Random.Mersenne
diff --git a/todo b/todo
new file mode 100644
--- /dev/null
+++ b/todo
@@ -0,0 +1,28 @@
+
+-- support mulitple generators
+
+    Want to save the state, and later continue the generation.
+    In the case of mt19937ar.c, if one saves mt[N] (624 words) and the
+    counter mti (1 word), then one can continue the computation by loading
+    these values.
+
+    * too much copying...
+    * supporting multiple, impure generators is possible though.
+
+
+-- Also provide a RandomGen instance
+
+-- eager evaluation
+    -- fill arrays in chunks
+    -- possible api for this?
+
+-- support fast range bounds
+    -- too slow on haskell side currently.
+
+-- statistical correctness, DieHard suite.
+    -- too complex.
+
+-- coverage tests
+    -- fixed in head.
+
+-- move to .Unsafe