diff --git a/Text/Pandoc/Lens.hs b/Text/Pandoc/Lens.hs
--- a/Text/Pandoc/Lens.hs
+++ b/Text/Pandoc/Lens.hs
@@ -1,79 +1,224 @@
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TemplateHaskell #-}
 
-module Text.Pandoc.Lens where
-                
+module Text.Pandoc.Lens
+    ( -- * Documents
+      body
+    , meta
+      -- * Blocks
+      -- | Prisms are provided for the constructors of 'Block'
+      -- as well as a 'Plated' instance.
+    , Block
+    , _Plain
+    , _Para
+    , _CodeBlock
+    , _BlockQuote
+    , _BulletList
+    , _DefinitionList
+    , _HorizontalRule
+    , _Null
+      -- * Inlines
+      -- | Prisms are provided for the constructors of 'Inline'
+      -- as well as a 'Plated' instance.
+    , Inline
+    , _Str
+    , _Emph
+    , _Strong
+    , _Strikeout
+    , _Superscript
+    , _Subscript
+    , _SmallCaps
+    -- , _Quoted
+    -- , _Cite
+    , _Code
+    , _Space
+    , _LineBreak
+    -- , _Math
+    -- , _RawInline
+    -- , _Link
+    -- , _Image
+    , _Note
+    , _Span
+      -- * Attributes
+    , HasAttr(..)
+    ) where
+
 import Control.Applicative
 import Control.Lens
 import Text.Pandoc.Definition
 import Data.Map (Map)
 
+-- | The body of a pandoc document
 body :: Lens' Pandoc [Block]
 body = lens (\(Pandoc _ b)->b) (\(Pandoc m _) b->Pandoc m b)
 
+-- | A traversal focusing on a particular metadata value of a document
+meta :: String -> Traversal' Pandoc MetaValue
+meta m = metaL . _Wrapped' . ix m
+  where
+    metaL :: Lens' Pandoc Meta
+    metaL = lens (\(Pandoc m _)->m) (\(Pandoc _ a) m->Pandoc m a)
+
+instance Wrapped Meta where
+    type Unwrapped Meta = Map String MetaValue
+    _Wrapped' = iso unMeta Meta
+
+-- | A prism on a 'Plain' 'Block'
 _Plain :: Prism' Block [Inline]
 _Plain = prism' Plain f
   where
     f (Plain x) = Just x
     f _         = Nothing
 
+-- | A prism on a paragraph 'Block'
 _Para :: Prism' Block [Inline]
 _Para = prism' Para f
   where
     f (Para x)  = Just x
     f _         = Nothing
 
+-- | A prism on the text of a 'CodeBlock'
 _CodeBlock :: Prism' Block String
 _CodeBlock = prism' (CodeBlock nullAttr) f
   where
     f (CodeBlock _ x)    = Just x
     f _                  = Nothing
 
+-- | A prism on a 'BlockQuote'
 _BlockQuote :: Prism' Block [Block]
 _BlockQuote = prism' BlockQuote f
   where
     f (BlockQuote x)     = Just x
     f _                  = Nothing
 
+-- | A prism on the items of a bullet list 'Block'
 _BulletList :: Prism' Block [[Block]]
 _BulletList = prism' BulletList f
   where
     f (BulletList x)     = Just x
     f _                  = Nothing
-      
+
+-- | A prism on the items of a definition list 'Block'
 _DefinitionList :: Prism' Block [([Inline], [[Block]])]
 _DefinitionList = prism' DefinitionList f
   where
     f (DefinitionList x) = Just x
     f _                  = Nothing
 
+-- | A prism on a 'HorizontalRule' 'Block'
 _HorizontalRule :: Prism' Block ()
 _HorizontalRule = prism' (const HorizontalRule) f
   where
     f HorizontalRule     = Just ()
     f _                  = Nothing
 
+-- | A prism on a 'Null' 'Block'
 _Null :: Prism' Block ()
 _Null = prism' (const Null) f
   where
     f Null = Just ()
     f _    = Nothing
 
---makePrisms ''Inline
---makePrisms ''MetaValue
+-- | A prism on a 'Str' 'Inline'
+_Str :: Prism' Inline String
+_Str = prism' Str f
+  where
+    f (Str s) = Just s
+    f _       = Nothing
 
---meta :: String -> Prism' Pandoc MetaValue
-meta m = metaL . unwrap . ix m
+-- | A prism on an 'Emph' 'Inline'
+_Emph :: Prism' Inline [Inline]
+_Emph = prism' Emph f
   where
-    unwrap :: Iso' Meta (Map String MetaValue)
-    unwrap = iso unMeta Meta
-    metaL :: Lens' Pandoc Meta
-    metaL = lens (\(Pandoc m _)->m) (\(Pandoc _ a) m->Pandoc m a)
-  
+    f (Emph s) = Just s
+    f _        = Nothing
+
+-- | A prism on a 'Strong' 'Inline'
+_Strong :: Prism' Inline [Inline]
+_Strong = prism' Strong f
+  where
+    f (Strong s) = Just s
+    f _          = Nothing
+
+-- | A prism on a 'Strikeout' 'Inline'
+_Strikeout :: Prism' Inline [Inline]
+_Strikeout = prism' Strikeout f
+  where
+    f (Strikeout s) = Just s
+    f _             = Nothing
+
+-- | A prism on a 'Superscript' 'Inline'
+_Superscript :: Prism' Inline [Inline]
+_Superscript = prism' Superscript f
+  where
+    f (Superscript s) = Just s
+    f _               = Nothing
+
+-- | A prism on a 'Subscript' 'Inline'
+_Subscript :: Prism' Inline [Inline]
+_Subscript = prism' Subscript f
+  where
+    f (Subscript s) = Just s
+    f _             = Nothing
+
+-- | A prism on a 'SmallCaps' 'Inline'
+_SmallCaps :: Prism' Inline [Inline]
+_SmallCaps = prism' SmallCaps f
+  where
+    f (SmallCaps s) = Just s
+    f _             = Nothing
+
+-- | A prism on the body of a 'Code' 'Inline'
+_Code :: Prism' Inline String
+_Code = prism' (Code nullAttr) f
+  where
+    f (Code _ s) = Just s
+    f _          = Nothing
+
+-- | A prism on a 'Space' 'Inline'
+_Space :: Prism' Inline ()
+_Space = prism' (const Space) f
+  where
+    f Space = Just ()
+    f _     = Nothing
+
+-- | A prism on a 'LineBreak' 'Inline'
+_LineBreak :: Prism' Inline ()
+_LineBreak = prism' (const LineBreak) f
+  where
+    f LineBreak = Just ()
+    f _         = Nothing
+
+-- | A prism on a 'Note' 'Inline'
+_Note :: Prism' Inline [Block]
+_Note = prism' Note f
+  where
+    f (Note s) = Just s
+    f _        = Nothing
+
+-- | A prism on a 'Span' 'Inline'
+_Span :: Prism' Inline [Inline]
+_Span = prism' (Span nullAttr) f
+  where
+    f (Span _ s) = Just s
+    f _          = Nothing
+
+instance Plated Inline
+instance Plated Block
+
+-- | An object that has attributes
 class HasAttr a where
+  -- | A traversal over the attributes of an object
   attributes :: Traversal' a Attr
-  
+
 instance HasAttr Block where
   attributes f (CodeBlock a s) = fmap (\a'->CodeBlock a' s) (f a)
   attributes f (Header n a s)  = fmap (\a'->Header n a' s) (f a)
   attributes f (Div a s)       = fmap (\a'->Div a' s) (f a)
+  attributes _ x = pure x
+
+instance HasAttr Inline where
+  attributes f (Code a s) = fmap (\a'->Code a' s) (f a)
+  attributes f (Span a s) = fmap (\a'->Span a' s) (f a)
   attributes _ x = pure x
diff --git a/pandoc-lens.cabal b/pandoc-lens.cabal
--- a/pandoc-lens.cabal
+++ b/pandoc-lens.cabal
@@ -1,5 +1,5 @@
 name:                pandoc-lens
-version:             0.1.0.0
+version:             0.2.0
 synopsis:            Lenses for Pandoc documents
 description:         Lenses for Pandoc documents
 homepage:            http://github.com/bgamari/pandoc-lens
@@ -18,5 +18,8 @@
 
 library
   exposed-modules:     Text.Pandoc.Lens
-  build-depends:       base >=4.7 && <4.8, pandoc-types >=1.12 && <1.13, lens >=4.2 && <4.3, containers
+  build-depends:       base >=4.7 && <4.8,
+                       containers >=0.5 && <0.6,
+                       pandoc-types >=1.12 && <1.13,
+                       lens >=4.2 && <4.3
   default-language:    Haskell2010