diff --git a/CHANGES b/CHANGES
deleted file mode 100644
--- a/CHANGES
+++ /dev/null
@@ -1,20 +0,0 @@
-% [DeepArrow](http://haskell.org/haskellwiki/DeepArrow) changes
-
-## Version 0.1 ##
-
-+  Removed `Data.Tupler`.  Replaced `Pair1` & `Pair2` by `(:*:)` and `(::*::)` in
-   `Control.Compose` from [TypeCompose].
-+  `FunD` and `FunDble`, for convenient Arrow definitions.  See also `FunA` &
-   `FunAble` in [TypeCompose].
-
-## Version 0.0.2 ##
-
-+  Haddock comments for inpFirst & inpSecond
-+  Moved the orphan Arrow instance of Pair2 from Control.Arrow.DeepArrow to
-   Data.Tupler.
-
-## Version 0.0.1 ##
-
-+  Changed all files to *nix-style line endings.
-
- [TypeCompose]: http://haskell.org/haskellwiki/TypeCompose
diff --git a/DeepArrow.cabal b/DeepArrow.cabal
--- a/DeepArrow.cabal
+++ b/DeepArrow.cabal
@@ -1,5 +1,5 @@
 Name:			DeepArrow
-Version:		0.3.3
+Version:		0.3.4
 Synopsis:		Arrows for "deep application"
 Category:               Combinators, Control
 Description:
@@ -30,14 +30,14 @@
   @a~>b@), a recent extension to GHC.  In reading the documentation and
   code, be aware that infix operators bind more tightly than @->@.
   .
-  &#169; 2007 by Conal Elliott (<http://conal.net>); BSD3 license.
+  &#169; 2007-2012 by Conal Elliott (<http://conal.net>); BSD3 license.
 Author:			Conal Elliott <conal@conal.net>
 Maintainer:		conal@conal.net
 Homepage:		http://haskell.org/haskellwiki/DeepArrow
-Package-Url:		http://darcs.haskell.org/packages/DeepArrow
+Package-Url:		http://code.haskell.org/~conal/code/DeepArrow
 License:		BSD3
 Stability:		experimental
-Copyright:		(c) 2007,2009 by Conal Elliott
+Copyright:		(c) 2007-2012 by Conal Elliott
 Build-type:             Simple
 Hs-Source-Dirs:		src
 Build-Depends:		base<5, mtl, TypeCompose>=0.6.7, haskell-src
diff --git a/Makefile b/Makefile
deleted file mode 100644
--- a/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# For special configuration, especially for docs.  Otherwise see README.
-
-haddock-interfaces=\
-  http://haskell.org/ghc/docs/latest/html/libraries/base,c:/ghc/ghc-6.6/doc/html/libraries/base/base.haddock \
-  http://haskell.org/ghc/docs/latest/html/libraries/mtl,c:/ghc/ghc-6.6/doc/html/libraries/mtl/mtl.haddock
-
-include ../my-cabal-make.inc
diff --git a/README b/README
deleted file mode 100644
--- a/README
+++ /dev/null
@@ -1,14 +0,0 @@
-The DeepArrow library provides a framework for type-directed composition
-of value editors.  For a fuller description and link to documentation,
-please see the Haskell wiki page:
-
-  http://haskell.org/haskellwiki/DeepArrow
-
-You can configure, build, and install all in the usual way with Cabal
-commands.
-
-  runhaskell Setup.lhs configure
-  runhaskell Setup.lhs build
-  runhaskell Setup.lhs install
-
-See src/Control/Arrow/DeepArrow/Examples.hs for examples.
diff --git a/TODO b/TODO
deleted file mode 100644
--- a/TODO
+++ /dev/null
diff --git a/src/Control/Arrow/DeepArrow.hs b/src/Control/Arrow/DeepArrow.hs
--- a/src/Control/Arrow/DeepArrow.hs
+++ b/src/Control/Arrow/DeepArrow.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE TypeOperators #-}
--- For ghc 6.6 compatibility
--- {-# OPTIONS -fglasgow-exts #-}
+{-# OPTIONS -Wall #-}
 
 ----------------------------------------------------------------------
 -- |
@@ -118,7 +117,10 @@
   -- composeA :: Arrow (~~>) => (a ~~> b, b ~~> c) ~> (a ~~>c)
   -- composeA = arr (uncurry (>>>))
 
+-- TODO: eliminate idA, now that Arrow derives from Category, which has
+-- id.
 
+
 {----------------------------------------------------------
     Composable function extractors
 ----------------------------------------------------------}
@@ -273,7 +275,6 @@
 
 
 
-
 {----------------------------------------------------------
     Some utilities
 ----------------------------------------------------------}
@@ -282,3 +283,7 @@
 (->|) :: (DeepArrow (~>), FunArr (~>) w)
       => w (a->b) -> w (b->c) -> w (a->c)
 (->|) f g = result (toArr g) $$ f
+
+-- -- | Pre- and post-processing
+-- (~>) :: DeepArrow (-->) => (a' --> a) -> (b --> b') -> ((a -> b) --> (a' -> b'))
+-- f ~> h = result h >>> argument f
diff --git a/src/Language/Haskell/ToHs.hs b/src/Language/Haskell/ToHs.hs
--- a/src/Language/Haskell/ToHs.hs
+++ b/src/Language/Haskell/ToHs.hs
@@ -1,8 +1,8 @@
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
 ----------------------------------------------------------------------
 -- |
 -- Module      :  Language.Haskell.ToHs
--- Copyright   :  (c) Conal Elliott 2007
+-- Copyright   :  (c) Conal Elliott 2007-2012
 -- License     :  BSD3
 -- 
 -- Maintainer  :  conal@conal.net