diff --git a/doc/imports.qbk b/doc/imports.qbk
index 788bc68d3..208bb28d8 100644
--- a/doc/imports.qbk
+++ b/doc/imports.qbk
@@ -11,21 +11,25 @@
 =============================================================================/]
 
 [import src/examples/quick_start.cpp]
+
 [import src/examples/algorithms/area.cpp]
 [import src/examples/algorithms/area_with_strategy.cpp]
 [import src/examples/algorithms/append.cpp]
+[import src/examples/algorithms/assign.cpp]
 [import src/examples/algorithms/assign_2d_point.cpp]
 [import src/examples/algorithms/assign_3d_point.cpp]
-[import src/examples/algorithms/assign_box_corners.cpp]
 [import src/examples/algorithms/assign_inverse.cpp]
-[import src/examples/algorithms/assign_with_range.cpp]
-[import src/examples/algorithms/assign_point_to_index.cpp]
-[import src/examples/algorithms/assign_point_from_index.cpp]
+[import src/examples/algorithms/assign_points.cpp]
 [import src/examples/algorithms/clear.cpp]
 [import src/examples/algorithms/centroid.cpp]
+[import src/examples/algorithms/comparable_distance.cpp]
+[import src/examples/algorithms/convert.cpp]
+[import src/examples/algorithms/convex_hull.cpp]
+[import src/examples/algorithms/correct.cpp]
 [import src/examples/algorithms/distance.cpp]
 [import src/examples/algorithms/difference.cpp]
 [import src/examples/algorithms/envelope.cpp]
+[import src/examples/algorithms/equals.cpp]
 [import src/examples/algorithms/expand.cpp]
 [import src/examples/algorithms/for_each_point.cpp]
 [import src/examples/algorithms/for_each_point_const.cpp]
@@ -47,12 +51,27 @@
 [import src/examples/algorithms/return_envelope.cpp]
 [import src/examples/algorithms/simplify.cpp]
 [import src/examples/algorithms/sym_difference.cpp]
+[import src/examples/algorithms/transform.cpp]
+[import src/examples/algorithms/transform_with_strategy.cpp]
 [import src/examples/algorithms/union.cpp]
 [import src/examples/algorithms/unique.cpp]
 [import src/examples/algorithms/within.cpp]
+
+[import src/examples/core/coordinate_type.cpp]
+[import src/examples/core/coordinate_system.cpp]
+[import src/examples/core/coordinate_dimension.cpp]
+[import src/examples/core/point_order.cpp]
+[import src/examples/core/closure.cpp]
+
 [import src/examples/core/get_point.cpp]
 [import src/examples/core/get_box.cpp]
 [import src/examples/core/set_point.cpp]
 [import src/examples/core/set_box.cpp]
+[import src/examples/core/degree_radian.cpp]
+
+[import src/examples/core/point_type.cpp]
+[import src/examples/core/tag.cpp]
+[import src/examples/core/tag_cast.cpp]
+
 [import src/examples/geometries/point.cpp]
 [import src/examples/geometries/register/point.cpp]
diff --git a/doc/make_qbk.py b/doc/make_qbk.py
index 5401471b7..c57c66b40 100755
--- a/doc/make_qbk.py
+++ b/doc/make_qbk.py
@@ -81,9 +81,10 @@ access_functions = ["get", "set", "exterior_ring", "interior_rings"
 coordinate_systems = ["cartesian", "geographic", "polar", "spherical"]
 
 core = ["closure", "coordinate_system", "coordinate_type", "cs_tag"
-    , "dimension", "exception", "geometry_id", "interior_type"
-    , "is_areal", "is_linear", "is_radian", "point_order"
-    , "point_type", "ring_type", "tag", "topological_dimension" ]
+    , "dimension", "exception", "interior_type"
+    , "degree", "radian"
+    , "is_radian", "point_order"
+    , "point_type", "ring_type", "tag", "tag_cast" ]
 
 exceptions = ["exception", "centroid_exception"];
 
diff --git a/doc/quickref.xml b/doc/quickref.xml
index 268fcfaa5..3241aba28 100644
--- a/doc/quickref.xml
+++ b/doc/quickref.xml
@@ -133,25 +133,17 @@
     <bridgehead renderas="sect3">Metafunctions</bridgehead>
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.core.cs_tag">cs_tag</link></member>
+     <member><link linkend="geometry.reference.core.closure">closure</link></member>
      <member><link linkend="geometry.reference.core.coordinate_type">coordinate_type</link></member>
      <member><link linkend="geometry.reference.core.coordinate_system">coordinate_system</link></member>
      <member><link linkend="geometry.reference.core.dimension">dimension</link></member>
-     <member><link linkend="geometry.reference.core.geometry_id">geometry_id</link></member>
      <member><link linkend="geometry.reference.core.interior_type">interior_type</link></member>
-     <!-- will be replaced by tag inheritance
-     <member><link linkend="geometry.reference.core.is_linear">is_linear</link></member>
-     <member><link linkend="geometry.reference.core.is_multi">is_multi</link></member>
-     -->
      <member><link linkend="geometry.reference.core.is_radian">is_radian</link></member>
      <member><link linkend="geometry.reference.core.point_order">point_order</link></member>
      <member><link linkend="geometry.reference.core.point_type">point_type</link></member>
      <member><link linkend="geometry.reference.core.ring_type">ring_type</link></member>
-     <!-- for internal use only (detail?)
-     <member><link linkend="geometry.reference.core.replace_point_type">replace_point_type</link></member>
-     <member><link linkend="geometry.reference.core.reverse_dispatch">reverse_dispatch</link></member>
-     -->
      <member><link linkend="geometry.reference.core.tag">tag</link></member>
-     <member><link linkend="geometry.reference.core.topological_dimension">topological_dimension</link></member>
+     <member><link linkend="geometry.reference.core.tag_cast">tag_cast</link></member>
     </simplelist>
    </entry>
    <entry valign="top">
@@ -194,8 +186,8 @@
    <entry valign="top">
     <bridgehead renderas="sect3">Numeric</bridgehead>
     <simplelist type="vert" columns="1">
-    <member><link linkend="geometry.reference.max_corner">max_corner</link></member>
-    <member><link linkend="geometry.reference.min_corner">min_corner</link></member>
+    <member><link linkend="geometry.reference.constants.max_corner">max_corner</link></member>
+    <member><link linkend="geometry.reference.constants.min_corner">min_corner</link></member>
     <member><link linkend="geometry.reference.enumerations.order_selector">order_selector</link></member>
     <member><link linkend="geometry.reference.enumerations.closure_selector">closure_selector</link></member>
     </simplelist>
@@ -203,8 +195,8 @@
    <entry valign="top">
     <bridgehead renderas="sect3">Types</bridgehead>
     <simplelist type="vert" columns="1">
-    <member><link linkend="geometry.reference.degree">degree</link></member>
-    <member><link linkend="geometry.reference.radian">radian</link></member>
+    <member><link linkend="geometry.reference.core.degree">degree</link></member>
+    <member><link linkend="geometry.reference.core.radian">radian</link></member>
     </simplelist>
    </entry>
    <entry valign="top">
@@ -298,12 +290,16 @@
     </simplelist>
     <bridgehead renderas="sect3">Assign</bridgehead>
     <simplelist type="vert" columns="1">
-     <member><link linkend="geometry.reference.algorithms.assign">assign</link></member>
-     <member><link linkend="geometry.reference.algorithms.assign.assign_box_corners">assign_box_corners</link></member>
+     <member><link linkend="geometry.reference.algorithms.assign.assign">assign</link></member>
      <member><link linkend="geometry.reference.algorithms.assign.assign_inverse">assign_inverse</link></member>
-     <member><link linkend="geometry.reference.algorithms.assign.assign_point_from_index">assign_point_from_index</link></member>
-     <member><link linkend="geometry.reference.algorithms.assign.assign_point_to_index">assign_point_to_index</link></member>
      <member><link linkend="geometry.reference.algorithms.assign.assign_zero">assign_zero</link></member>
+     <member><link linkend="geometry.reference.algorithms.assign.assign_points">assign_points</link></member>
+     <member>assign_values (
+        <link linkend="geometry.reference.algorithms.assign.assign_values_3_2_coordinate_values">2</link>
+        <link linkend="geometry.reference.algorithms.assign.assign_values_4_3_coordinate_values">3</link>
+        <link linkend="geometry.reference.algorithms.assign.assign_values_5_4_coordinate_values">4</link>
+        coordinate values)
+     </member>
     </simplelist>
    </entry>
    <entry valign="top">
@@ -315,6 +311,10 @@
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.algorithms.clear">clear</link></member>
     </simplelist>
+    <bridgehead renderas="sect3">Convert</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="geometry.reference.algorithms.convert">convert</link></member>
+    </simplelist>
     <bridgehead renderas="sect3">Convex Hull</bridgehead>
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.algorithms.convex_hull">convex_hull</link></member>
@@ -387,7 +387,7 @@
     </simplelist>
     <bridgehead renderas="sect3">Union</bridgehead>
     <simplelist type="vert" columns="1">
-     <member><link linkend="geometry.reference.algorithms.union">union</link></member>
+     <member><link linkend="geometry.reference.algorithms.union_">union</link></member>
     </simplelist>
     <bridgehead renderas="sect3">Unique</bridgehead>
     <simplelist type="vert" columns="1">
diff --git a/doc/reference.qbk b/doc/reference.qbk
index 40d5ca87d..54cb12783 100644
--- a/doc/reference.qbk
+++ b/doc/reference.qbk
@@ -52,9 +52,9 @@
 [section:assign assign]
 [include generated/assign.qbk]
 [endsect]
-[section:append append]
+[/section:append append]
 [include generated/append.qbk]
-[endsect]
+[/endsect]
 
 
 [section:buffer buffer]
@@ -65,25 +65,13 @@
 [include generated/centroid.qbk]
 [endsect]
 
-[section:clear clear]
 [include generated/clear.qbk]
-[endsect]
-
-[section:convex_hull convex_hull]
+[include generated/convert.qbk]
 [include generated/convex_hull.qbk]
-[endsect]
-
 [include generated/correct.qbk]
 
-
-[section:difference difference]
 [include generated/difference.qbk]
-[endsect]
-
-[section:disjoint disjoint]
 [include generated/disjoint.qbk]
-[endsect]
-
 
 [section:distance distance]
 [include generated/distance.qbk]
@@ -93,21 +81,16 @@
 [include generated/envelope.qbk]
 [endsect]
 
-[section:equals equals]
 [include generated/equals.qbk]
-[endsect]
-
-[section:expand expand]
 [include generated/expand.qbk]
-[endsect]
 
 [section:for_each for_each]
 [include generated/for_each.qbk]
 [endsect]
 
-[section:intersection intersection]
+[/section:intersection intersection]
 [include generated/intersection.qbk]
-[endsect]
+[/endsect]
 
 [section:intersects intersects]
 [include generated/intersects.qbk]
@@ -126,9 +109,7 @@
 [include generated/num_points.qbk]
 
 
-[section:overlaps overlaps]
 [include generated/overlaps.qbk]
-[endsect]
 
 [section:perimeter perimeter]
 [include generated/perimeter.qbk]
@@ -140,18 +121,17 @@
 [include generated/simplify.qbk]
 [endsect]
 
-[section:sym_difference sym_difference]
+[/section:sym_difference sym_difference]
 [include generated/sym_difference.qbk]
-[endsect]
+[/endsect]
 
 [section:transform transform]
 [include generated/transform.qbk]
 [endsect]
 
-
-[section:union union]
+[/section:union union]
 [include generated/union.qbk]
-[endsect]
+[/endsect]
 
 [include generated/unique.qbk]
 
@@ -161,13 +141,10 @@
 
 [endsect] [/algorithms]
 
-
 [section:arithmetic Arithmetic]
 [include generated/arithmetic.qbk]
 [endsect] 
 
-
-
 [section:concepts Concepts]
 [include concept/point.qbk]
 [include concept/linestring.qbk]
@@ -180,34 +157,35 @@
 [include concept/segment.qbk]
 [endsect] [/concepts]
 
+[section:constants Constants]
+[include reference/core/min_corner.qbk]
+[include reference/core/max_corner.qbk]
+[endsect] 
+
 [section:cs Coordinate Systems]
 [include generated/cartesian.qbk]
 [include generated/spherical.qbk]
 [include generated/geographic.qbk]
 [endsect] [/coordinate systems]
 
-
-
 [section:core Core Metafunctions]
 [include generated/closure.qbk]
 [include generated/coordinate_system.qbk]
 [include generated/coordinate_type.qbk]
 [include generated/cs_tag.qbk]
+[include generated/degree.qbk]
 [include generated/dimension.qbk]
 [include generated/exception.qbk]
-[include generated/geometry_id.qbk]
 [include generated/interior_type.qbk]
-[include generated/is_areal.qbk]
-[include generated/is_linear.qbk]
 [include generated/is_radian.qbk]
 [include generated/point_order.qbk]
 [include generated/point_type.qbk]
+[include generated/radian.qbk]
 [include generated/ring_type.qbk]
 [include generated/tag.qbk]
-[include generated/topological_dimension.qbk]
+[include generated/tag_cast.qbk]
 [endsect] [/core metafunctions]
 
-
 [section:enumerations Enumerations]
 [include generated/enum.qbk]
 [endsect]