diff --git a/ginger.cabal b/ginger.cabal
--- a/ginger.cabal
+++ b/ginger.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                ginger
-version:             0.8.1.0
+version:             0.8.2.0
 synopsis:            An implementation of the Jinja2 template language in Haskell
 description:         Ginger is Jinja, minus the most blatant pythonisms. Wants
                      to be feature complete, but isn't quite there yet.
@@ -28,11 +28,12 @@
                  , Text.Ginger.Optimizer
                  , Text.Ginger.Parse
                  , Text.Ginger.Run
+                 , Text.Ginger.Run.Type
+                 , Text.Ginger.Run.Builtins
                  , Text.PrintfA
                  , Text.Ginger.Run.VM
                  , Text.Ginger.Run.FuncUtils
-  other-modules: Text.Ginger.Run.Type
-               , Text.Ginger.Run.Builtins
+  -- other-modules:
   -- other-extensions:
   build-depends: base >=4.8 && <5
                , aeson
diff --git a/src/Text/Ginger/Run.hs b/src/Text/Ginger/Run.hs
--- a/src/Text/Ginger/Run.hs
+++ b/src/Text/Ginger/Run.hs
@@ -54,6 +54,11 @@
 , hoistRun
 , hoistNewlines
 , hoistRunState
+-- * Errors
+, RuntimeError (..)
+, runtimeErrorWhat
+, runtimeErrorWhere
+, runtimeErrorMessage
 )
 where
 
diff --git a/src/Text/Ginger/Run/Builtins.hs b/src/Text/Ginger/Run/Builtins.hs
--- a/src/Text/Ginger/Run/Builtins.hs
+++ b/src/Text/Ginger/Run/Builtins.hs
@@ -6,6 +6,11 @@
 {-#LANGUAGE MultiParamTypeClasses #-}
 {-#LANGUAGE ScopedTypeVariables #-}
 {-#LANGUAGE LambdaCase #-}
+
+-- | Implementations of the default template context functions and values. You
+-- will not normally need to import this module, unless you want to provide
+-- your own context with things that reuse functionality from the default
+-- ones.
 module Text.Ginger.Run.Builtins
 where
 
diff --git a/src/Text/Ginger/Run/Type.hs b/src/Text/Ginger/Run/Type.hs
--- a/src/Text/Ginger/Run/Type.hs
+++ b/src/Text/Ginger/Run/Type.hs
@@ -5,6 +5,12 @@
 {-#LANGUAGE TypeSynonymInstances #-}
 {-#LANGUAGE MultiParamTypeClasses #-}
 {-#LANGUAGE ScopedTypeVariables #-}
+
+-- | The internals of the 'Run' monad, and various things needed to make the
+-- magic happen. You will not normally need to import this module;
+-- 'Text.Ginger.Run' re-exports the things you probably want. However, if you
+-- want to provide your own run monad that extends 'Run' somehow, this module
+-- may be of use.
 module Text.Ginger.Run.Type
 ( GingerContext (..)
 , makeContext
@@ -26,6 +32,8 @@
 , RunState (..)
 , RuntimeError (..)
 , runtimeErrorWhat
+, runtimeErrorWhere
+, runtimeErrorMessage
 -- * The Newlines type
 -- | Required for handling indentation
 , Newlines (..)