diff --git a/www/html/menu.html b/www/html/menu.html
index 4761b65..ff6ce3b 100644
--- a/www/html/menu.html
+++ b/www/html/menu.html
@@ -3,7 +3,7 @@
    <a href="index.php?page=contributing">Contributing</a><br/>
    <a href="index.php?page=documentation">Documentation</a><br/>
    - <a href="index.php?page=getting-started">Getting Started</a><br/>
-   - <a href="index.php?page=switch">Switch to Reference Policy</a><br/>
+   - <a href="index.php?page=switch">Use Reference Policy</a><br/>
    - <a href="api-docs/">Interface Reference</a><br/>
    <a href="index.php?page=download">Download</a><br/>
    <!--<IMG src="http://sourceforge.net/sflogo.php?group_id=???&amp;type=1" w
diff --git a/www/html/status.html b/www/html/status.html
index 8ba8ca2..d847325 100644
--- a/www/html/status.html
+++ b/www/html/status.html
@@ -1,5 +1,5 @@
 <h1>Status</h1>
-<strong>Current Version: 20050707</strong>
+<strong>Current Version: 20050802</strong>
 <p>
 	See <a href="index.php?page=download">download</a> for download
 	information. Details of this release are part of the <a href="html/Changelog.txt">changelog</a>. This release
@@ -10,52 +10,8 @@
 	on real systems.  It is targeted towards developers, to show the direction of
 	the policy's development and to solicit feedback.
 </p>
-<h1>Roadmap</h1>
-
-<table cellpadding="3" cellspacing="0" border="1">
-  <tbody>
-    <tr>
-      <th colspan="3" class="title">Reference Policy Roadmap</th>
-    </tr>
-    <tr>
-      <td class="header">Version</td>
-      <td class="header">Date</td>
-      <td class="header">Description</td>
-    </tr>
-    <tr>
-      <td>0.1</td>
-      <td>June 2005</td>
-      <td>Initial public release, basic policy restructuring, some infrastructure, few modules, and minimal documentation.</td>
-    </tr>
-    <tr>
-      <td>0.2</td>
-      <td>July 2005</td>
-      <td>Restructuring complete, additional modules, and improved infrastructure.</td>
-    </tr>
-    <tr>
-      <td>0.3</td>
-      <td>August 2005</td>
-      <td>Additional modules, documentation, and base module configuration support.</td>
-    </tr>
-    <tr>
-      <td>0.4</td>
-      <td>September 2005</td>
-      <td>Additional modules, documentation, and tested loadable module support.</td>
-    </tr>
-    <tr>
-      <td>0.5</td>
-      <td>October 2005</td>
-      <td>Additional modules, documentation, targeted policy, and tested MLS support</td>
-    </tr>
-    <tr>
-      <td>0.6</td>
-      <td>December 2005</td>
-      <td>Additional modules, documentation, and module variations</td>
-    </tr>
-  </tbody>
-</table>
-
-<h1>Status and Tasks</h1>
+<p>&nbsp;</p>
+<h2>Status and Tasks</h2>
 <table border="1" cellspacing="0" cellpadding="3">
 	<tr>
 	<th class="title" colspan="3">Reference Policy Status</th>
@@ -155,6 +111,51 @@
 			No planned changes</td>
 	</tr>
 </table>
+<p>&nbsp;</p>
+<h2>Roadmap</h2>
+<table cellpadding="3" cellspacing="0" border="1">
+  <tbody>
+    <tr>
+      <th colspan="3" class="title">Reference Policy Roadmap</th>
+    </tr>
+    <tr>
+      <td class="header">Version</td>
+      <td class="header">Date</td>
+      <td class="header">Description</td>
+    </tr>
+    <tr>
+      <td>0.1</td>
+      <td>June 2005</td>
+      <td>Initial public release, basic policy restructuring, some infrastructure, few modules, and minimal documentation.</td>
+    </tr>
+    <tr>
+      <td>0.2</td>
+      <td>July 2005</td>
+      <td>Restructuring complete, additional modules, and improved infrastructure.</td>
+    </tr>
+    <tr>
+      <td>0.3</td>
+      <td>August 2005</td>
+      <td>Additional modules, documentation, and base module configuration support.</td>
+    </tr>
+    <tr>
+      <td>0.4</td>
+      <td>September 2005</td>
+      <td>Additional modules, documentation, and tested loadable module support.</td>
+    </tr>
+    <tr>
+      <td>0.5</td>
+      <td>October 2005</td>
+      <td>Additional modules, documentation, targeted policy, and tested MLS support</td>
+    </tr>
+    <tr>
+      <td>0.6</td>
+      <td>December 2005</td>
+      <td>Additional modules, documentation, and module variations</td>
+    </tr>
+  </tbody>
+</table>
+<p>&nbsp;</p>
 <h2>Policy Conversion</h2>
 <p>
 This phase of reference policy development involves the conversion of policies
@@ -183,16 +184,13 @@ is a listing of modules which need to be converted:
 <li>gpm</li>
 <li>howl</li>
 <li>inn</li>
-<li>ipsec</li>
 <li>irqbalance</li>
 <li>ktalkd</li>
 <li>kudzu</li>
 <li>loadkeys</li>
 <li>lockdev</li>
 <li>mrtg</li>
-<li>mysql</li>
 <li>ntpd</li>
-<li>pcmcia (was cardmgr)</li>
 <li>portmap</li>
 <li>postfix</li>
 <li>postgresql</li>
@@ -201,7 +199,6 @@ is a listing of modules which need to be converted:
 <li>quota</li>
 <li>radius</li>
 <li>radvd</li>
-<li>raid (was mdadm)</li>
 <li>rlogin</li>
 <li>rsync</li>
 <li>samba</li>
diff --git a/www/html/switch.html b/www/html/switch.html
index 43a6013..a7ad882 100644
--- a/www/html/switch.html
+++ b/www/html/switch.html
@@ -7,16 +7,16 @@
 	Download and unpack the policy
 </h2>
 <p>
-	The policy is <a href="index.php?page=download">available</a> and
+	The policy is <a href="index.php?page=download">available</a>
 	from Sourceforge.  Download the policy, and unpack it to a temporary
 	directory.  Then use the install-src make target to install the policy
 	sources.
 </p>
 <div id="codeblock">
 <pre>
-# tar -jxvf refpolicy-xxxxxxxx.tar.bz2 -C /tmp
-# cd /tmp/refpolicy
-# make install-src
+# <b>tar -jxvf refpolicy-20050802.tar.bz2 -C /tmp</b>
+# <b>cd /tmp/refpolicy</b>
+# <b>make install-src</b>
 </pre>
 </div>
 <h2>
@@ -29,12 +29,13 @@
 </p>
 <div id="codeblock">
 <pre>
-# cd /etc/selinux/refpolicy/src/policy
-# cp policy/modules.conf.targeted_example policy/modules.conf
+# <b>cd /etc/selinux/refpolicy/src/policy</b>
+# <b>cp policy/modules.conf.targeted_example policy/modules.conf</b>
 </pre>
 </div>
 <p>
-	Near the top of the policy Makefile, the policy has a few build options.
+	Edit the policy Makefile (/etc/selinux/refpolicy/src/policy/Makefile).
+	Near the top of the file, the policy has a few build options.
 	The TYPE needs to be set to targeted, and the DISTRO option needs to be
 	uncommented and set to redhat.
 </p>
@@ -88,7 +89,7 @@ MONOLITHIC=y
 </p>
 <div id="codeblock">
 <pre>
-# make install
+# <b>make install</b>
 </pre>
 </div>
 <h2>
@@ -117,11 +118,11 @@ SELINUXTYPE=<font color=red><b>refpolicy</b></font>
 </h2>
 <p>
 	The system needs to be restarted with the new policy, and relabeled
-	on booting.
+	on booting, to finalize the switch.
 </p>
 <div id="codeblock">
 <pre>
-# touch /.autorelabel
-# shutdown -r now
+# <b>touch /.autorelabel</b>
+# <b>shutdown -r now</b>
 </pre>
 </div>