diff --git a/src/docbkx/introduction/about.xml b/src/docbkx/introduction/about.xml
index a0821cd1f1..51c25e6bca 100644
--- a/src/docbkx/introduction/about.xml
+++ b/src/docbkx/introduction/about.xml
@@ -25,7 +25,7 @@
             <ulink url="http://spring.neo4j.org/issues">SpringSource JIRA</ulink>, the
             <ulink url="http://spring.neo4j.org/discussion">SpringSource NOSQL Forum</ulink>,
             <ulink url="http://github.com/SpringSource/spring-data-neo4j/issues">github comments or issues</ulink>,
-            or the <ulink url="http://neo4j.org/community/list/">Neo4j mailing list</ulink>.
+            or the <ulink url="http://neo4j.org/forums/">Neo4j mailing list</ulink>.
         </para>
     </section>
     <section><title>Format of the Book</title>
diff --git a/src/docbkx/reference/programming-model/mapping.xml b/src/docbkx/reference/programming-model/mapping.xml
index a18f719a54..d9ba9e447b 100644
--- a/src/docbkx/reference/programming-model/mapping.xml
+++ b/src/docbkx/reference/programming-model/mapping.xml
@@ -3,7 +3,7 @@
 <section id="reference:mapping">
     <title>Object Graph Mapping</title>
     <para>
-       Until recently Spring Data Neo4j supported the only more advanced and flexible <xref linkend="reference:aspectj">AspectJ based mapping approach</xref>. Feedback about complications with the AspectJ tooling and other implications supported us in adding a <xref linkend="reference:simple-mapping">simpler mapping</xref> to Spring Data Neo4j.
+       Until recently Spring Data Neo4j supported the only more advanced and flexible AspectJ based mapping approach, see <xref linkend="reference:aspectj" />. Feedback about complications with the AspectJ tooling and other implications supported us in adding a simpler mapping (see <xref linkend="reference:simple-mapping" />) to Spring Data Neo4j.
 	   Both versions work with the same annotations and provide similar API's but different behaviour.
     </para>
 	<para>
diff --git a/src/docbkx/reference/programming-model/programming-model.xml b/src/docbkx/reference/programming-model/programming-model.xml
index 42e222e127..42ee7dfe8a 100644
--- a/src/docbkx/reference/programming-model/programming-model.xml
+++ b/src/docbkx/reference/programming-model/programming-model.xml
@@ -10,6 +10,7 @@
     </para>
     <xi:include href="mapping.xml"/>
     <xi:include href="aspectj.xml"/>
+    <xi:include href="simple_mapping.xml"/>
     <xi:include href="node-entities.xml"/>
     <xi:include href="relationships.xml"/>
     <xi:include href="indexing.xml"/>
diff --git a/src/docbkx/reference/programming-model/spatial.xml b/src/docbkx/reference/programming-model/spatial.xml
index bea4a0ff7f..f9c51fd99a 100644
--- a/src/docbkx/reference/programming-model/spatial.xml
+++ b/src/docbkx/reference/programming-model/spatial.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<section id="reference:mapping">
+<section id="reference:spatial">
     <title>Geospatial Queries</title>
     <para>
 	<code>SpatialRepository</code> is a dedicated Repository for spatial queries. 
@@ -72,4 +72,4 @@ Iterable<Person> teamMembers = personRepository.findWithinDistance("personLayer"
 ]]></programlisting>
 </example>
 </para>
-</section>
\ No newline at end of file
+</section>
diff --git a/src/docbkx/reference/programming-model/template.xml b/src/docbkx/reference/programming-model/template.xml
index 25b074a2de..8eb54d1de7 100644
--- a/src/docbkx/reference/programming-model/template.xml
+++ b/src/docbkx/reference/programming-model/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<chapter id="reference:template" xmlns:xi="http://www.w3.org/2001/XInclude">
+<section id="reference:template" xmlns:xi="http://www.w3.org/2001/XInclude">
     <title>Neo4jTemplate</title>
     <para>
         The <code>Neo4jTemplate</code> offers the convenient API of Spring templates for the Neo4j graph
@@ -76,4 +76,4 @@
         those calls. All the other template methods require single network operations.
         </para>
     </section>
-</chapter>
+</section>