diff --git a/lab000-virtualbox-basics.xml b/lab000-virtualbox-basics.xml
index 3dfab31a..28da8bc7 100644
--- a/lab000-virtualbox-basics.xml
+++ b/lab000-virtualbox-basics.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY nbsp "&#160;">
+]>
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -50,10 +54,10 @@
       <tbody>
         <tr>
           <td rowspan="1" colspan="1">VT Enabled PC:</td>
-          <td rowspan="1" colspan="1">Intel ix or Amd QuadCore</td>
+          <td rowspan="1" colspan="1">Intel ix or AMD QuadCore</td>
         </tr>
         <tr>
-          <td rowspan="1" colspan="1">4GB Ram:</td>
+          <td rowspan="1" colspan="1">4&nbsp;GB RAM:</td>
           <td rowspan="1" colspan="1">DDR2/DDR3</td>
         </tr>
       </tbody>
@@ -372,9 +376,9 @@
       </imageobject>
     </mediaobject>
   </figure>
-    <para>Select appropriate RAM, minimum 512 MB of RAM for Control
-      Node. Rest all can be default settings. The hard disk size can
-      be 8GB as default.</para>
+    <para>Select the appropriate amount of RAM. For the control node,
+    the minimum is 512&nbsp;MB of RAM. For other settings, use the
+    defaults. The hard disk size can be 8&nbsp;GB as default.</para>
     <para>Configure the networks</para>
     <para>(Ignore the IP Address for now, you will set it up from
       inside the VM)</para>
@@ -439,8 +443,8 @@
     are doing.</para>
     <para><guilabel>Network Node:</guilabel></para>
     <para>Create a new Virtual Machine,</para>
-    <para>Minimum RAM is 512MB. Rest all can be left default. Minimum
-    HDD space 8GB.</para>
+    <para>Minimum RAM is 512&nbsp;MB. Rest all can be left default. Minimum
+    HDD space 8&nbsp;GB.</para>
   <figure>
     <title>Create New Virtual Machine</title>
     <mediaobject>
@@ -526,8 +530,8 @@
     like DNS servers etc. (not necessary). Unless you know what you
     are doing.</para>
     <para><guilabel>Compute Node:</guilabel></para>
-    <para>Create a new virtual machine, give it atleast 1,000 MB RAM.
-    Rest all can be left as defaults. Give atleast 8GB HDD.</para>
+    <para>Create a virtual machine with at least 1,000&nbsp;MB RAM and
+    8&nbsp;GB HDD. For other settings, use the defaults.</para>
   <figure>
     <title>Create New Virtual Machine</title>
     <mediaobject>
diff --git a/module003-ch006-more-concepts.xml b/module003-ch006-more-concepts.xml
index 6c5d5b90..d3ded816 100644
--- a/module003-ch006-more-concepts.xml
+++ b/module003-ch006-more-concepts.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY nbsp "&#160;">
+]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -41,13 +45,13 @@
             encoded as C%2B%2Bfinal%28v2%29.txt and therefore be 24
             bytes in length rather than the expected 16.</para>
         <para>The maximum allowable size for a storage object upon
-            upload is 5 gigabytes (GB) and the minimum is zero bytes.
+            upload is 5&nbsp;GB and the minimum is zero bytes.
             You can use the built-in large object support and the
-            swift utility to retrieve objects larger than 5 GB.</para>
+            swift utility to retrieve objects larger than 5&nbsp;GB.</para>
         <para>For metadata, you should not exceed 90 individual
             key/value pairs for any one object and the total byte
-            length of all key/value pairs should not exceed 4KB (4096
-            bytes).</para>
+            length of all key/value pairs should not exceed 4&nbsp;KB
+            (4096&nbsp;bytes).</para>
         <para><guilabel>Language-Specific API
         Bindings</guilabel></para>
         <para>A set of supported API bindings in several popular
@@ -217,4 +221,4 @@
                 other errors are found they are logged. For example,
                 an object’s listing cannot be found on any container
                 server it should be.</para>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/module003-ch007-swift-cluster-architecture.xml b/module003-ch007-swift-cluster-architecture.xml
index 43f2bfb7..1da218db 100644
--- a/module003-ch007-swift-cluster-architecture.xml
+++ b/module003-ch007-swift-cluster-architecture.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY nbsp "&#160;">
+]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -69,12 +73,12 @@
             provisioned with single gigabit or 10 gigabit network
             interface depending on expected workload and desired
             performance.</para>
-        <para>Currently 2 TB or 3 TB SATA disks deliver good
-            price/performance value. Desktop-grade drives can be used
-            where there are responsive remote hands in the datacenter,
-            and enterprise-grade drives can be used where this is not
-            the case.</para>
-            <para><guilabel>Factors to Consider</guilabel></para>
+        <para>Currently, a 2&nbsp;TB or 3&nbsp;TB SATA disk delivers
+           good performance for the price. Desktop-grade drives can
+           be used where there are responsive remote hands in the
+           datacenter, and enterprise-grade drives can be used where
+           this is not the case.</para>
+        <para><guilabel>Factors to Consider</guilabel></para>
             <para>Desired I/O performance for single-threaded requests
                 should be kept in mind. This system does not use RAID,
                 so each request for an object is handled by a single