diff --git a/doc/callable_traits.qbk b/doc/callable_traits.qbk
index 362ee13..581084d 100644
--- a/doc/callable_traits.qbk
+++ b/doc/callable_traits.qbk
@@ -198,7 +198,7 @@ The use cases for [libname] are closely related to those of [@http://www.boost.o
   * [link_pmd]
   * [link_fn_obj]
 
-[heading:ref_simple_callable [[concept_simple_callable]]]
+[heading:ref_simple_callable [concept_simple_callable]]
 * Includes all [link_callable] types, [*except] for [link_overloaded_fn_obj]
 
 [heading:ref_simple_invokable [concept_simple_invokable]]
@@ -207,7 +207,7 @@ The use cases for [libname] are closely related to those of [@http://www.boost.o
 [heading:ref_invokable [concept_invokable]]
 * Includes all [link_callable] types, [*except] for [link_fn] and [link_abominable]
 
-[heading:ref_constexpr_constructble [concept_constexpr_constructble]]
+[heading:ref_constexpr_constructible [concept_constexpr_constructible]]
 * Any [@http://en.cppreference.com/w/cpp/concept/LiteralType LiteralType] that is also default-constructible
 
 [endsect]
diff --git a/doc/html/index.html b/doc/html/index.html
index 049d4de..0b2dc33 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -548,7 +548,7 @@
             umbrella
           </li>
 <li class="listitem">
-            Mutually exclusive with [link_fn]
+            Mutually exclusive with <a class="link" href=""><span class="green">Function</span></a>
           </li>
 <li class="listitem">
             e.g. <code class="computeroutput"><span class="keyword">void</span><span class="special">(</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">)</span> <span class="keyword">const</span></code>
@@ -600,7 +600,7 @@
             May be cv-qualified and/or ref-qualified.
           </li>
 <li class="listitem">
-            Mutually exclusive with [link_overloaded_fn_obj]
+            Mutually exclusive with <a class="link" href=""><span class="green">OverloadedFunctionObject</span></a>
           </li>
 <li class="listitem">
             e.g. the type of this lambda: <code class="computeroutput"><span class="special">[](</span><span class="keyword">int</span> <span class="identifier">x</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">y</span><span class="special">)</span> <span class="special">{</span> <span class="keyword">return</span> <span class="identifier">x</span> <span class="special">+</span> <span class="identifier">y</span><span class="special">;</span> <span class="special">}</span></code>
@@ -645,7 +645,7 @@
         <span class="phrase"><a name="callable_traits.introduction.basic_concepts.ref_fn_obj"></a></span><a class="link" href="index.html#callable_traits.introduction.basic_concepts.ref_fn_obj"><span class="green">FunctionObject</span></a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            Any type that is either an [link_overloaded_fn_obj] or a [link_simple_fn_obj]
+            Any type that is either an <a class="link" href=""><span class="green">OverloadedFunctionObject</span></a> or a <a class="link" href=""><span class="green">SimpleFunctionObject</span></a>
           </li></ul></div>
 <h5>
 <a name="callable_traits.introduction.basic_concepts.h9"></a>
@@ -655,55 +655,55 @@
             The superset of the following:
             <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-                  [link_fn_ptr]
+                  <a class="link" href=""><span class="green">FunctionPtr</span></a>
                 </li>
 <li class="listitem">
-                  [link_fn_ref]
+                  <a class="link" href=""><span class="green">FunctionReference</span></a>
                 </li>
 <li class="listitem">
-                  [link_fn]
+                  <a class="link" href=""><span class="green">Function</span></a>
                 </li>
 <li class="listitem">
-                  [link_abominable]
+                  <a class="link" href=""><span class="green">AbominableFunction</span></a>
                 </li>
 <li class="listitem">
-                  [link_pmf]
+                  <a class="link" href=""><span class="green">MemberFunctionPtr</span></a>
                 </li>
 <li class="listitem">
-                  [link_pmd]
+                  <a class="link" href=""><span class="green">MemberDataPtr</span></a>
                 </li>
 <li class="listitem">
-                  [link_fn_obj]
+                  <a class="link" href=""><span class="green">FunctionObject</span></a>
                 </li>
 </ul></div>
           </li></ul></div>
 <h5>
 <a name="callable_traits.introduction.basic_concepts.h10"></a>
-        <span class="phrase"><a name="callable_traits.introduction.basic_concepts.ref_simple_callable"></a></span><a class="link" href="index.html#callable_traits.introduction.basic_concepts.ref_simple_callable">[<span class="green">SimpleCallable</span>]</a>
+        <span class="phrase"><a name="callable_traits.introduction.basic_concepts.ref_simple_callable"></a></span><a class="link" href="index.html#callable_traits.introduction.basic_concepts.ref_simple_callable"><span class="green">SimpleCallable</span></a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            Includes all [link_callable] types, <span class="bold"><strong>except</strong></span>
-            for [link_overloaded_fn_obj]
+            Includes all <a class="link" href=""><span class="green">Callable</span></a>
+            types, <span class="bold"><strong>except</strong></span> for <a class="link" href=""><span class="green">OverloadedFunctionObject</span></a>
           </li></ul></div>
 <h5>
 <a name="callable_traits.introduction.basic_concepts.h11"></a>
         <span class="phrase"><a name="callable_traits.introduction.basic_concepts.ref_simple_invokable"></a></span><a class="link" href="index.html#callable_traits.introduction.basic_concepts.ref_simple_invokable"><span class="green">SimpleInvokable</span></a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            Includes all [link_callable] types, <span class="bold"><strong>except</strong></span>
-            for [link_overloaded_fn_obj], [link_fn], and [link_abominable]
+            Includes all <a class="link" href=""><span class="green">Callable</span></a>
+            types, <span class="bold"><strong>except</strong></span> for <a class="link" href=""><span class="green">OverloadedFunctionObject</span></a>, <a class="link" href=""><span class="green">Function</span></a>, and <a class="link" href=""><span class="green">AbominableFunction</span></a>
           </li></ul></div>
 <h5>
 <a name="callable_traits.introduction.basic_concepts.h12"></a>
         <span class="phrase"><a name="callable_traits.introduction.basic_concepts.ref_invokable"></a></span><a class="link" href="index.html#callable_traits.introduction.basic_concepts.ref_invokable"><span class="green">Invokable</span></a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-            Includes all [link_callable] types, <span class="bold"><strong>except</strong></span>
-            for [link_fn] and [link_abominable]
+            Includes all <a class="link" href=""><span class="green">Callable</span></a>
+            types, <span class="bold"><strong>except</strong></span> for <a class="link" href=""><span class="green">Function</span></a> and <a class="link" href=""><span class="green">AbominableFunction</span></a>
           </li></ul></div>
 <h5>
 <a name="callable_traits.introduction.basic_concepts.h13"></a>
-        <span class="phrase"><a name="callable_traits.introduction.basic_concepts.ref_constexpr_constructble"></a></span><a class="link" href="index.html#callable_traits.introduction.basic_concepts.ref_constexpr_constructble">[concept_constexpr_constructble]</a>
+        <span class="phrase"><a name="callable_traits.introduction.basic_concepts.ref_constexpr_constructible"></a></span><a class="link" href="index.html#callable_traits.introduction.basic_concepts.ref_constexpr_constructible"><span class="green">ConstexprDefaultConstructible</span></a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
             Any <a href="http://en.cppreference.com/w/cpp/concept/LiteralType" target="_top">LiteralType</a>
diff --git a/test/remove_function_volatile.cpp b/test/remove_function_volatile.cpp
index 58201d4..36afd48 100644
--- a/test/remove_function_volatile.cpp
+++ b/test/remove_function_volatile.cpp
@@ -34,6 +34,8 @@ int main() {
 		using cvr = char(foo::*)(foo*, int) const volatile &&;
 
 		CT_ASSERT(std::is_same<f,   ct::remove_function_volatile<f>>{});
+        CT_ASSERT(std::is_same<l,   ct::remove_function_volatile<vl>>{});
+        CT_ASSERT(std::is_same<l,   ct::remove_function_volatile<l>>{});
 		CT_ASSERT(std::is_same<f,   ct::remove_function_volatile<v>>{});
 		CT_ASSERT(std::is_same<r,  ct::remove_function_volatile<r>>{});
 		CT_ASSERT(std::is_same<r,  ct::remove_function_volatile<vr>>{});
@@ -61,6 +63,8 @@ int main() {
 
 		CT_ASSERT(std::is_same<f,  ct::remove_function_volatile<f>>{});
 		CT_ASSERT(std::is_same<f,  ct::remove_function_volatile<v>>{});
+        CT_ASSERT(std::is_same<l,   ct::remove_function_volatile<vl>>{});
+        CT_ASSERT(std::is_same<l,   ct::remove_function_volatile<l>>{});
 		CT_ASSERT(std::is_same<r,  ct::remove_function_volatile<r>>{});
 		CT_ASSERT(std::is_same<r,  ct::remove_function_volatile<vr>>{});
 		CT_ASSERT(std::is_same<c,  ct::remove_function_volatile<c>>{});