diff --git a/docs/source/building.rst b/docs/source/compiling.rst
similarity index 98%
rename from docs/source/building.rst
rename to docs/source/compiling.rst
index a7109b3f2..d271f9632 100644
--- a/docs/source/building.rst
+++ b/docs/source/compiling.rst
@@ -1,6 +1,6 @@
-==============================
-Writing and building a program
-==============================
+===================
+Compiling a program
+===================
 
 .. _building_compiler:
 
@@ -189,7 +189,7 @@ One or more .p8 module files
 
     c64: $C000 - $CEFF
 
-    cx16: $A000 - $BFFF     (note: assumes that the correct HiRam bank #1 is mapped in at all times!)
+    cx16: $A000 - $BFFF     (note: you must make sure that the correct HiRam bank #1 is mapped in when accessing these variables!)
 
     If you use this option, you can no longer use the part of the above memory area that is
     now alotted to the variables for your own purposes. The output of the 64tass assembler step at the
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 28d197605..1aa6730c1 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -195,7 +195,7 @@ Look in the `syntax-files <https://github.com/irmen/prog8/tree/master/syntax-fil
     :maxdepth: 2
     :caption: Contents of this manual:
 
-    building.rst
+    compiling.rst
     programming.rst
     syntaxreference.rst
     libraries.rst
diff --git a/docs/source/libraries.rst b/docs/source/libraries.rst
index 43d1b1f02..4c6c63bc6 100644
--- a/docs/source/libraries.rst
+++ b/docs/source/libraries.rst
@@ -1,6 +1,6 @@
-************************
-Compiler library modules
-************************
+===============
+Library modules
+===============
 
 The compiler provides several "built-in" library modules with useful subroutine and variables.
 
diff --git a/docs/source/programming.rst b/docs/source/programming.rst
index ce2bdbfc4..3eb19fa86 100644
--- a/docs/source/programming.rst
+++ b/docs/source/programming.rst
@@ -1,8 +1,8 @@
 .. _programstructure:
 
-====================
-Programming in Prog8
-====================
+==========================
+What makes a Prog8 program
+==========================
 
 This chapter describes a high level overview of the elements that make up a program.
 Details about the syntax can be found in the :ref:`syntaxreference` chapter.
diff --git a/docs/source/targetsystem.rst b/docs/source/targetsystem.rst
index 7ed5b2649..1d70525a5 100644
--- a/docs/source/targetsystem.rst
+++ b/docs/source/targetsystem.rst
@@ -1,6 +1,6 @@
-***************************
+===========================
 Target system specification
-***************************
+===========================
 
 Prog8 targets the following hardware: