diff --git a/cabal.project.local b/cabal.project.local
--- a/cabal.project.local
+++ b/cabal.project.local
@@ -1,3 +1,3 @@
 constraints: wordchoice +fast-llvm
-with-compiler: ghc-8.2.1
+with-compiler: ghc-8.2.2
 optimization: 2
diff --git a/wordchoice.cabal b/wordchoice.cabal
--- a/wordchoice.cabal
+++ b/wordchoice.cabal
@@ -1,80 +1,80 @@
-name:                wordchoice
-version:             0.1.2.4
-synopsis:            Get word counts and distributions
-description:         A command line tool to compute the word distribution from various types of document, converting to text with pandoc.
-homepage:            https://github.com/githubuser/wordchoice#readme
-license:             BSD3
-license-file:        LICENSE
-author:              Vanessa McHale
-maintainer:          vanessa.mchale@reconfigure.io
-copyright:           2017 Vanessa McHale
-category:            Web
-build-type:          Simple
-extra-source-files:  README.md
-                   , stack.yaml
-                   , cabal.project.local
-cabal-version:       >=1.10
+cabal-version: >=1.10
+name: wordchoice
+version: 0.1.2.5
+license: BSD3
+license-file: LICENSE
+copyright: 2017,2018 Vanessa McHale
+maintainer: vamchale@gmail.com
+author: Vanessa McHale
+synopsis: Get word counts and distributions
+description:
+    A command line tool to compute the word distribution from various types of document, converting to text with pandoc.
+category: Web
+build-type: Simple
+extra-source-files:
+    README.md
+    stack.yaml
+    cabal.project.local
 
-Flag llvm-fast {
-  Description: Enable build with llvm backend
-  Default: False
-}
+source-repository head
+    type: git
+    location: https://hub.darcs.net/vmchale/wordchoice
 
 library
-  hs-source-dirs:      src
-  exposed-modules:     Data.Text.WordCount
-                     , Data.Text.WordCount.Exec
-  other-modules:       Paths_wordchoice
-                     , Data.Text.WordCount.FileRead
-  build-depends:       base >= 4.8 && < 5
-                     , pandoc
-                     , containers
-                     , Glob
-                     , bytestring
-                     , binary
-                     , text
-                     , directory
-                     , optparse-applicative
-                     , composition-prelude
-                     , Chart
-                     , bytestring
-                     , system-filepath
-                     , Chart-diagrams
-                     , lens
-                     , transformers
-  default-language:    Haskell2010
-  default-extensions:  OverloadedStrings
+    exposed-modules:
+        Data.Text.WordCount
+        Data.Text.WordCount.Exec
+    hs-source-dirs: src
+    other-modules:
+        Paths_wordchoice
+        Data.Text.WordCount.FileRead
+    default-language: Haskell2010
+    default-extensions: OverloadedStrings
+    build-depends:
+        base >=4.8 && <5,
+        pandoc -any,
+        containers -any,
+        Glob -any,
+        bytestring -any,
+        binary -any,
+        text -any,
+        directory -any,
+        optparse-applicative -any,
+        composition-prelude -any,
+        Chart -any,
+        bytestring -any,
+        system-filepath -any,
+        Chart-diagrams -any,
+        lens -any,
+        transformers -any
 
 executable wrd
-  hs-source-dirs:      app
-  main-is:             Main.hs
-  -- ghc-options:         
-  -- -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base
-                     , wordchoice
-  default-language:    Haskell2010
+    main-is: Main.hs
+    hs-source-dirs: app
+    default-language: Haskell2010
+    build-depends:
+        base -any,
+        wordchoice -any
 
 test-suite wordchoice-test
-  type:                exitcode-stdio-1.0
-  hs-source-dirs:      test
-  main-is:             Spec.hs
-  build-depends:       base
-                     , wordchoice
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-  default-language:    Haskell2010
+    type: exitcode-stdio-1.0
+    main-is: Spec.hs
+    hs-source-dirs: test
+    default-language: Haskell2010
+    ghc-options: -threaded -rtsopts -with-rtsopts=-N
+    build-depends:
+        base -any,
+        wordchoice -any
 
 benchmark wordchoice-bench
-  type:             exitcode-stdio-1.0
-  hs-source-dirs:   bench
-  main-is:          Bench.hs
-  build-depends:    base
-                  , criterion
-                  , text
-                  , wordchoice
-                  , pandoc
-  ghc-options:      -threaded -rtsopts -with-rtsopts=-N -O3
-  default-language: Haskell2010
-
-source-repository head
-  type:     git
-  location: https://github.com/githubuser/wordchoice
+    type: exitcode-stdio-1.0
+    main-is: Bench.hs
+    hs-source-dirs: bench
+    default-language: Haskell2010
+    ghc-options: -O2
+    build-depends:
+        base -any,
+        criterion -any,
+        text -any,
+        wordchoice -any,
+        pandoc -any