diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -121,3 +121,10 @@
 
 0.2.3.2:
 		* allow v0.13 of pango/cairo
+
+0.2.3.3:
+	    * Update AMP Changes for ghc 7.10
+
+0.2.3.4:
+        * clean up warnings
+        * use transformers instead of MaybeT
diff --git a/THANKS b/THANKS
--- a/THANKS
+++ b/THANKS
@@ -4,3 +4,4 @@
  * takano-akio pointed out bug in interaction between 
      non-default point size and legend placement/scaling
  * pacak updated for AMP for ghc 7.10
+ * pacak - clean up warnings and simplify dependencies
diff --git a/examples/Test.hs b/examples/Test.hs
--- a/examples/Test.hs
+++ b/examples/Test.hs
@@ -117,13 +117,12 @@
                            glyph (4,0.2) (return ())
                            text (3,0.0) (setText "from the α to the Ω")
                            cairo (\_ _ _ _ -> do
-                                    --C.stroke
-                                    --C.newPath
-                                    C.moveTo 1 0.75
-                                    C.lineTo 2 (-0.5)
+                                    C.newPath
+                                    C.moveTo 3 0.75
+                                    C.lineTo 4 (-0.5)
                                     C.stroke
-                                    --C.rectangle (pi/2) (-0.75) (pi/2) 1
-                                    --C.fill
+                                    C.rectangle (pi/2) (-1) (pi/2) 1
+                                    C.fill
                                  )
 --                         setRange YAxis Lower Log (-1.25) 1.25
 --                         setLegend True NorthEast Inside
diff --git a/lib/Control/Monad/Supply.hs b/lib/Control/Monad/Supply.hs
--- a/lib/Control/Monad/Supply.hs
+++ b/lib/Control/Monad/Supply.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.Supply
@@ -25,8 +26,9 @@
                             ) where
 
 -----------------------------------------------------------------------------
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative
-import Control.Monad (ap)
+#endif
 import Control.Monad.Writer
 import Control.Monad.Reader
 import Control.Monad.State
diff --git a/lib/Graphics/Rendering/Plot/Figure/Plot/Data.hs b/lib/Graphics/Rendering/Plot/Figure/Plot/Data.hs
--- a/lib/Graphics/Rendering/Plot/Figure/Plot/Data.hs
+++ b/lib/Graphics/Rendering/Plot/Figure/Plot/Data.hs
@@ -49,7 +49,7 @@
 import Control.Monad.State
 import Control.Monad.Reader
 import Control.Monad.Supply
-import Control.Monad.Maybe
+import Control.Monad.Trans.Maybe
 
 import Graphics.Rendering.Plot.Types
 import Graphics.Rendering.Plot.Figure.Line
diff --git a/lib/Graphics/Rendering/Plot/Render/Plot/Annotation.hs b/lib/Graphics/Rendering/Plot/Render/Plot/Annotation.hs
--- a/lib/Graphics/Rendering/Plot/Render/Plot/Annotation.hs
+++ b/lib/Graphics/Rendering/Plot/Render/Plot/Annotation.hs
@@ -138,12 +138,15 @@
   _ <- renderText te TRight TTop (x1) (y1)
   cairo $ C.restore
   return ()
-renderAnnotation xscale yscale (AnnCairo r) = do
+renderAnnotation _xscale _yscale (AnnCairo r) = do
   (BoundingBox x y w h) <- get
   cairo $ do
     C.save
-    --C.translate (x) (y)
-    C.scale (xscale) (yscale)
+    --let (x,y) = (x'*xscale,y'*yscale)
+    --let (w,h) = (w'*xscale,h'*yscale)
+    --flipVertical
+    --C.translate x y
+    --C.scale (xscale) (yscale)
     r x y w h
     C.restore
 
diff --git a/lib/Graphics/Rendering/Plot/Render/Plot/Data.hs b/lib/Graphics/Rendering/Plot/Render/Plot/Data.hs
--- a/lib/Graphics/Rendering/Plot/Render/Plot/Data.hs
+++ b/lib/Graphics/Rendering/Plot/Render/Plot/Data.hs
@@ -46,7 +46,7 @@
 
 import Control.Monad.Reader
 import Control.Monad.State
-import Control.Monad.Maybe
+import Control.Monad.Trans.Maybe
 
 import Graphics.Rendering.Plot.Types
 
diff --git a/lib/Graphics/Rendering/Plot/Render/Plot/Legend.hs b/lib/Graphics/Rendering/Plot/Render/Plot/Legend.hs
--- a/lib/Graphics/Rendering/Plot/Render/Plot/Legend.hs
+++ b/lib/Graphics/Rendering/Plot/Render/Plot/Legend.hs
@@ -255,7 +255,7 @@
   return ()
 
 renderLegendEntry :: Double -> Double -> Double -> Double -> TextOptions -> (Double,Double) -> (SeriesLabel,Decoration) -> Render (Double,Double)
-renderLegendEntry wa ha w h to (x,y) (l,d) = do
+renderLegendEntry wa ha _w h to (x,y) (l,d) = do
   renderLegendSample x y legendSampleWidth h d
   pc <- asks _pangocontext
   cairo $ do
diff --git a/lib/Graphics/Rendering/Plot/Render/Types.hs b/lib/Graphics/Rendering/Plot/Render/Types.hs
--- a/lib/Graphics/Rendering/Plot/Render/Types.hs
+++ b/lib/Graphics/Rendering/Plot/Render/Types.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Graphics.Rendering.Plot.Render.Types
@@ -35,7 +35,9 @@
 import qualified Graphics.Rendering.Cairo.Matrix as CM
 import qualified Graphics.Rendering.Pango as P
 
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative
+#endif
 import Control.Monad.Reader
 import Control.Monad.State
 --import Control.Monad.Trans
diff --git a/lib/Graphics/Rendering/Plot/Types.hs b/lib/Graphics/Rendering/Plot/Types.hs
--- a/lib/Graphics/Rendering/Plot/Types.hs
+++ b/lib/Graphics/Rendering/Plot/Types.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Graphics.Rendering.Plot.Types
@@ -32,7 +33,9 @@
 import qualified Graphics.Rendering.Cairo as C
 import qualified Graphics.Rendering.Pango as P
 
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative
+#endif
 import Control.Monad.State
 import Control.Monad.Reader
 
diff --git a/plot.cabal b/plot.cabal
--- a/plot.cabal
+++ b/plot.cabal
@@ -1,5 +1,5 @@
 Name:                plot
-Version:             0.2.3.3
+Version:             0.2.3.4
 License:             BSD3
 License-file:        LICENSE
 Copyright:           (c) A.V.H. McPhail 2010, 2012, 2013, 2014
@@ -50,7 +50,7 @@
 
   Build-Depends:     base >= 4 && < 5,
                      mtl > 2, array,
-                     MaybeT,
+                     transformers > 0.2 && < 0.5,
                      pango >= 0.11.2 && < 0.14, cairo >= 0.11.1 && < 0.14,
                      colour >= 2.2.1 && < 2.4,
                      hmatrix >= 0.10