diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,12 +1,10 @@
 Spelling word suggestion tool
-Copyright © 2010 Bart Massey and Greg Weber
+Copyright © 2008 Bart Massey
 ALL RIGHTS RESERVED
 
 This software is licensed under the "3-clause ('new')
 BSD License".  Please see the file COPYING provided with
 this distribution for license terms.
-
-This package is a newer version of the original package called "thimk".
 
 "thimk" (an old joke) is a command-line spelling word
 suggestion tool.  You give it a possibly-misspelled word,
diff --git a/Text/SpellingSuggest/LowLevel.hs b/Text/SpellingSuggest/LowLevel.hs
--- a/Text/SpellingSuggest/LowLevel.hs
+++ b/Text/SpellingSuggest/LowLevel.hs
@@ -32,10 +32,10 @@
 editDistance s t =
   restrictedDamerauLevenshteinDistance ec s t where
     ec = EditCosts {
-      insertionCost = 2,
-      deletionCost = 2,
-      transpositionCost = 1,
-      substitutionCost = 3 }
+      insertionCosts = ConstantCost 2,
+      deletionCosts = ConstantCost 2,
+      transpositionCosts = ConstantCost 1,
+      substitutionCosts = ConstantCost 3 }
 
 -- | Map any given word to a constant "phonetic code".
 --   In other words, suppress phonetic coding.
diff --git a/Text/SpellingSuggest/PCDB.hs b/Text/SpellingSuggest/PCDB.hs
--- a/Text/SpellingSuggest/PCDB.hs
+++ b/Text/SpellingSuggest/PCDB.hs
@@ -15,11 +15,11 @@
 import Text.PhoneticCode.Soundex
 import Text.PhoneticCode.Phonix
 
--- import Paths_spelling_suggest;
+import Paths_spelling_suggest;
 
 -- | File path for default cache database.
 defaultDB :: IO String
-defaultDB = return "spelling-suggest.sq3"
+defaultDB = getDataFileName "spelling-suggest.sq3"
 
 -- | Create and populate the phonetic codes database, given
 -- a list of words and a database path.
diff --git a/spelling-suggest.cabal b/spelling-suggest.cabal
--- a/spelling-suggest.cabal
+++ b/spelling-suggest.cabal
@@ -1,38 +1,36 @@
 name: spelling-suggest
-version: 0.5.0.1
-cabal-version: >= 1.2
+version: 0.5.1
+cabal-version: >= 1.6
 build-type: Simple
 license: BSD3
 license-file: COPYING
-copyright: Copyright © 2010 Bart Massey and Greg Weber
-author: Bart Massey and Greg Weber
+copyright: Copyright © 2010 Greg Weber and Bart Massey
+author: Greg Weber and Bart Massey
 maintainer: bart@cs.pdx.edu, greg@gregweber.info
-homepage: http://wiki.cs.pdx.edu/bartforge/thimk
+homepage: https://github.com/BartMassey/haskell-spell-suggest
 category: Console, Text
 data-files: README, README.pcdb
 synopsis: Spelling suggestion tool with library and command-line interfaces.
 description: 
 
-    Given a possibly-misspelled word,
-    this tool spits out one or more properly-spelled words in order
+    "thimk" (an old joke) is a command-line spelling word
+    suggestion tool. You give it a possibly-misspelled word,
+    and it spits out one or more properly-spelled words in order
     of likelihood of similarity.
     .
-    This functionality is exported as a library via
-    Text.SpellingSuggest (suggest) and as
-    a command-line program "thimk" (an old joke)
+    This functionality is also exported as a library via
+    Text.SpellingSuggest (suggest)
     .
-    Running the program "thimk-makedb" is an optional (but highly recommended)
-    step to speed up lookups,
-    permitting reasonable performance on enormous dictionaries
-    by creating a
-    precompiled SQlite database of phonetic
-    codes for a dictionary.
+    There is an optional precompiled SQlite database of phonetic
+    codes for the entire dictionary, created with
+    "thimk-makedb".  This greatly speeds lookup, permitting
+    reasonable performance on enormous dictionaries.
 
 flag debug
 
 library
   build-depends: base >= 4.2 && < 5,
-                 edit-distance >= 0.1 && < 0.2,
+                 edit-distance >= 0.1 && < 0.3,
                  phonetic-code >= 0.1 && < 0.2,
                  sqlite >= 0.5.1 && < 0.6
   exposed-modules: Text.SpellingSuggest, Text.SpellingSuggest.PCDB,
@@ -44,7 +42,7 @@
   main-is: thimk.hs
   build-depends: base >= 4.2 && < 5,
                  parseargs >= 0.1.1 && < 0.2,
-                 edit-distance >= 0.1 && < 0.2,
+                 edit-distance >= 0.1 && < 0.3,
                  phonetic-code >= 0.1 && < 0.2,
                  sqlite >= 0.5.1 && < 0.6
   ghc-options: -Wall
@@ -58,3 +56,12 @@
   ghc-options: -Wall
   if flag(debug)
     cpp-options: -DDEBUG
+
+Source-repository head
+  type: git
+  location: git://github.com/BartMassey/haskell-spell-suggest.git
+
+Source-repository this
+  type: git
+  location: git://github.com/BartMassey/haskell-spell-suggest.git
+  tag: v0.5.1
diff --git a/thimk.hs b/thimk.hs
--- a/thimk.hs
+++ b/thimk.hs
@@ -22,7 +22,7 @@
   -- Go ahead and get the dictionary opened up.
   let dictPath = getArg av ArgDict
   let dbPath = getArg av ArgDB
-  dict <- openDictionary dbPath dictPath 
+  dict <- openDictionary dictPath dbPath
   -- Construct the search params.
   let prefilter = prefilterate av $ dictionaryIsDB dict
   let coder =