diff --git a/MemoTrie.cabal b/MemoTrie.cabal
--- a/MemoTrie.cabal
+++ b/MemoTrie.cabal
@@ -1,6 +1,6 @@
 Name:                MemoTrie
-Version:             0.5
-Cabal-Version:       >= 1.2
+Version:             0.6.1
+Cabal-Version:       >= 1.6
 Synopsis:            Trie-based memo functions
 Category:            Data
 Description:
@@ -11,20 +11,23 @@
   Project wiki page: <http://haskell.org/haskellwiki/MemoTrie>
   .
   &#169; 2008-2012 by Conal Elliott; BSD3 license.
+Homepage:            http://haskell.org/haskellwiki/MemoTrie
 Author:              Conal Elliott 
 Maintainer:          conal@conal.net
-Homepage:            http://haskell.org/haskellwiki/MemoTrie
-Package-Url:         http://code.haskell.org/MemoTrie
 Copyright:           (c) 2008-2012 by Conal Elliott
 License:             BSD3
 License-File:        COPYING
 Stability:           experimental
 build-type:          Simple
 
+source-repository head
+  type:     git
+  location: git://github.com/conal/MemoTrie.git
+
 Library
   hs-Source-Dirs:      src
   Extensions:          
   Build-Depends:       base < 5, void
   Exposed-Modules:     
                      Data.MemoTrie
-  ghc-options:         -Wall
+
diff --git a/src/Data/MemoTrie.hs b/src/Data/MemoTrie.hs
--- a/src/Data/MemoTrie.hs
+++ b/src/Data/MemoTrie.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GADTs, TypeFamilies, TypeOperators, ScopedTypeVariables, CPP #-}
+{-# LANGUAGE StandaloneDeriving, FlexibleInstances #-}
 {-# OPTIONS_GHC -Wall -fenable-rewrite-rules #-}
 -- ScopedTypeVariables works around a 6.10 bug.  The forall keyword is
 -- supposed to be recognized in a RULES pragma.
@@ -20,7 +21,7 @@
 ----------------------------------------------------------------------
 
 module Data.MemoTrie
-  ( HasTrie, (:->:)(..), trie, untrie, enumerate
+  ( HasTrie(..), (:->:)(..)
   , domain, idTrie, (@.@)
   -- , trie2, trie3, untrie2, untrie3
   , memo, memo2, memo3, mup
@@ -149,7 +150,7 @@
 ---- Instances
 
 instance HasTrie Void where
-  -- As suggested by Audun
+  -- As suggested by Audun Skaugen
   data Void :->: a = VoidTrie 
   trie _ = VoidTrie
   untrie VoidTrie = absurd