diff --git a/Text/Regex/TDFA/Text.hs b/Text/Regex/TDFA/Text.hs
--- a/Text/Regex/TDFA/Text.hs
+++ b/Text/Regex/TDFA/Text.hs
@@ -1,8 +1,15 @@
 {-| 
+Module      :  Text.Regex.TDFA.Text
+Copyright   :  Chris Kuklewicz 2007-2009, shelarcy 2012
+License     :  BSD-style (see the file LICENSE)
+
+Maintainer  :  shelarcy <shelarcy@gmail.com>
+Stability   :  experimental
+Portability :  GHC (uses text)
+
 This modules provides 'RegexMaker' and 'RegexLike' instances for using
-'Text' with the DFA backend ("Text.Regex.Lib.WrapDFAEngine" and
-"Text.Regex.Lazy.DFAEngineFPS").  This module is usually used via
-import "Text.Regex.TDFA".
+'Text' with the DFA backend ("Text.Regex.TDFA.NewDFA.Engine" and
+"Text.Regex.TDFA.NewDFA.Tester"). 
 
 This exports instances of the high level API and the medium level
 API of 'compile','execute', and 'regexec'.
@@ -61,12 +68,12 @@
   matchTest = myMatchTest
   matchOnceText regex source = 
     fmap (\ma -> let (o,l) = ma!0
-                 in (T.take o source
-                    ,fmap (\ol@(off,len) -> (T.take len (T.drop off source),ol)) ma
-                    ,T.drop (o+l) source))
+                 in (before o source
+                    ,fmap (\ol -> (extract ol source,ol)) ma
+                    ,after (o+l) source))
          (matchOnce regex source)
   matchAllText regex source =
-    map (fmap (\ol@(off,len) -> (T.take len (T.drop off source),ol)))
+    map (fmap (\ol -> (extract ol source,ol)))
         (matchAll regex source)
 
 compile :: CompOption -- ^ Flags (summed together)
diff --git a/Text/Regex/TDFA/Text/Lazy.hs b/Text/Regex/TDFA/Text/Lazy.hs
--- a/Text/Regex/TDFA/Text/Lazy.hs
+++ b/Text/Regex/TDFA/Text/Lazy.hs
@@ -1,8 +1,15 @@
 {-| 
+Module      :  Text.Regex.TDFA.Text.Lazy
+Copyright   :  Chris Kuklewicz 2007-2009, shelarcy 2012
+License     :  BSD-style (see the file LICENSE)
+
+Maintainer  :  shelarcy <shelarcy@gmail.com>
+Stability   :  experimental
+Portability :  GHC (uses text)
+
 This modules provides 'RegexMaker' and 'RegexLike' instances for using
-'Text' with the DFA backend ("Text.Regex.Lib.WrapDFAEngine" and
-"Text.Regex.Lazy.DFAEngineFPS").  This module is usually used via
-import "Text.Regex.TDFA".
+'Text' with the DFA backend ("Text.Regex.TDFA.NewDFA.Engine" and
+"Text.Regex.TDFA.NewDFA.Tester"). 
 
 This exports instances of the high level API and the medium level
 API of 'compile','execute', and 'regexec'.
diff --git a/regex-tdfa-text.cabal b/regex-tdfa-text.cabal
--- a/regex-tdfa-text.cabal
+++ b/regex-tdfa-text.cabal
@@ -1,11 +1,11 @@
 name:                regex-tdfa-text
 Cabal-Version:       >= 1.6
-version:             1.0
+version:             1.0.0.1
 synopsis:            Text interface for regex-tdfa
 description:         This provides text interface for regex-tdfa.
                      .
                      This should be part of regex-tdfa package. But my patches are not accepted yet. 
-                     So, I made separate package. If you are interested in my patches, see
+                     So, I made a separate package. If you are interested in my patches, see
                      <http://hub.darcs.net/shelarcy/regex-base> and <http://hub.darcs.net/shelarcy/regex-tdfa>.
 category:            Text
 license:             BSD3