diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,10 +1,17 @@
-hsc3-unsafe - haskell supercollider
+hsc3-unsafe
+-----------
 
-hsc3-unsafe provides Sound.SC3.UGen.Unsafe.
+[haskell][hs] [supercollider][sc3] ([hsc3][hsc3]) variant UGen
+constructors.
 
-  http://slavepianos.org/rd/?t=hsc3-unsafe
-  http://haskell.org/
-  http://audiosynth.com/
+[hsc3-unsafe][hsc3-unsafe] provides `Sound.SC3.UGen.Unsafe`.
 
-(c) rohan drape, 2006-2011
-    gpl, http://gnu.org/copyleft/
+[hs]: http://haskell.org/
+[sc3]: http://audiosynth.com/
+[hsc3]: http://rd.slavepianos.org/?t=hsc3
+[hsc3-unsafe]: http://rd.slavepianos.org/?t=hsc3-unsafe
+
+© [rohan drape][rd], 2006-2012, [gpl]
+
+[rd]: http://rd.slavepianos.org/
+[gpl]: http://gnu.org/copyleft/
diff --git a/Sound/SC3/UGen/Demand/Unsafe.hs b/Sound/SC3/UGen/Demand/Unsafe.hs
--- a/Sound/SC3/UGen/Demand/Unsafe.hs
+++ b/Sound/SC3/UGen/Demand/Unsafe.hs
@@ -1,10 +1,10 @@
 -- | Unsafe variants of functions at @Sound.SC3.UGen.Demand.Monadic@.
 module Sound.SC3.UGen.Demand.Unsafe where
 
-import Sound.SC3.UGen.UGen
-import Sound.SC3.UGen.Unsafe.Lift
-import qualified Sound.SC3.UGen.Demand.Monadic as D
+import Sound.SC3.UGen.Demand.Monad as D
 import Sound.SC3.UGen.Enum
+import Sound.SC3.UGen.Type
+import Sound.SC3.UGen.Unsafe.Lift
 
 -- | Buffer demand ugen.
 dbufrd :: UGen -> UGen -> Loop -> UGen
diff --git a/Sound/SC3/UGen/FFT/Unsafe.hs b/Sound/SC3/UGen/FFT/Unsafe.hs
--- a/Sound/SC3/UGen/FFT/Unsafe.hs
+++ b/Sound/SC3/UGen/FFT/Unsafe.hs
@@ -1,9 +1,9 @@
 -- | Unsafe variants of functions at @Sound.SC3.UGen.FFT.Monadic@.
 module Sound.SC3.UGen.FFT.Unsafe where
 
-import Sound.SC3.UGen.UGen
+import Sound.SC3.UGen.FFT.Monad as F
+import Sound.SC3.UGen.Type
 import Sound.SC3.UGen.Unsafe.Lift
-import qualified Sound.SC3.UGen.FFT.Monadic as F
 
 -- | Randomize order of bins.
 pv_BinScramble :: UGen -> UGen -> UGen -> UGen -> UGen
diff --git a/Sound/SC3/UGen/Noise/Unsafe.hs b/Sound/SC3/UGen/Noise/Unsafe.hs
--- a/Sound/SC3/UGen/Noise/Unsafe.hs
+++ b/Sound/SC3/UGen/Noise/Unsafe.hs
@@ -1,10 +1,10 @@
 -- | Unsafe variants of functions at @Sound.SC3.UGen.Noise.Monadic@.
 module Sound.SC3.UGen.Noise.Unsafe where
 
+import Sound.SC3.UGen.Noise.Monad as N
 import Sound.SC3.UGen.Rate
-import Sound.SC3.UGen.UGen
+import Sound.SC3.UGen.Type
 import Sound.SC3.UGen.Unsafe.Lift
-import qualified Sound.SC3.UGen.Noise.Monadic as N
 
 -- | Brown noise.
 brownNoise :: Rate -> UGen
diff --git a/Sound/SC3/UGen/Unsafe/Lift.hs b/Sound/SC3/UGen/Unsafe/Lift.hs
--- a/Sound/SC3/UGen/Unsafe/Lift.hs
+++ b/Sound/SC3/UGen/Unsafe/Lift.hs
@@ -1,7 +1,7 @@
 -- | Functions to lifting monadic 'UGen's to unsafe forms.
 module Sound.SC3.UGen.Unsafe.Lift where
 
-import Sound.SC3.UGen.UGen
+import Sound.SC3.UGen.Type
 import System.IO.Unsafe
 
 -- | Lift monadic UGen to unsafe form.
diff --git a/hsc3-unsafe.cabal b/hsc3-unsafe.cabal
--- a/hsc3-unsafe.cabal
+++ b/hsc3-unsafe.cabal
@@ -1,15 +1,15 @@
 Name:              hsc3-unsafe
-Version:           0.11
+Version:           0.12
 Synopsis:          Unsafe Haskell SuperCollider
-Description:       @hsc3-unsafe@ provides "Sound.SC3.UGen.Unsafe".
+Description:       Alternate non-deterministic UGen constructors.
 License:           GPL
 Category:          Sound
-Copyright:         (c) Rohan Drape, 2006-2011
+Copyright:         (c) Rohan Drape, 2006-2012
 Author:            Rohan Drape
 Maintainer:        rd@slavepianos.org
 Stability:         Experimental
-Homepage:          http://slavepianos.org/rd/?t=hsc3-unsafe
-Tested-With:       GHC == 7.2.2
+Homepage:          http://rd.slavepianos.org/?t=hsc3-unsafe
+Tested-With:       GHC == 7.6.1
 Build-Type:        Simple
 Cabal-Version:     >= 1.8
 
@@ -17,7 +17,7 @@
 
 Library
   Build-Depends:   base == 4.*,
-                   hsc3 == 0.11.*
+                   hsc3 == 0.12.*
   GHC-Options:     -Wall -fwarn-tabs
   Exposed-modules: Sound.SC3.UGen.Demand.Unsafe
                    Sound.SC3.UGen.FFT.Unsafe
@@ -27,4 +27,4 @@
 
 Source-Repository  head
   Type:            darcs
-  Location:        http://slavepianos.org/rd/sw/hsc3-unsafe/
+  Location:        http://rd.slavepianos.org/sw/hsc3-unsafe/