diff --git a/.htaccess b/.htaccess
index 27c6bb9..5480678 100644
--- a/.htaccess
+++ b/.htaccess
@@ -7,6 +7,7 @@ AddType text/xsl .xslt
 AddType application/xml .atom
 AddType text/html .xo
 AddType text/plain .txt
+AddType text/plain .py
 AddType video/mp4 .mp4
 AddType application/x-srt .srt
 AddType video/ogg .ogv
diff --git a/case-study-porting-chardet-to-python-3.html b/case-study-porting-chardet-to-python-3.html
index 78f3bf7..db3033b 100644
--- a/case-study-porting-chardet-to-python-3.html
+++ b/case-study-porting-chardet-to-python-3.html
@@ -4,6 +4,9 @@
 <meta charset="utf-8">
 <title>Case study: porting chardet to Python 3 - Dive into Python 3</title>
 <link rel="stylesheet" type="text/css" href="dip3.css">
+<style type="text/css">
+body{counter-reset:h1 20}
+</style>
 </head>
 <body>
 <h1>Case study: porting chardet to Python 3</h1>
@@ -724,5 +727,10 @@ TypeError: Can't convert 'bytes' object to str implicitly</samp></pre>
 
 <p id="skipcantconvertbytesobject">...</p>
 </section>
+
+<footer>
+<p class="c">&copy; 2001-4, 2009 Mark Pilgrim, <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a></p>
+</footer>
+
 </body>
 </html>
diff --git a/dip2.html b/dip2
similarity index 100%
rename from dip2.html
rename to dip2
diff --git a/dip3.css b/dip3.css
index 66b3f39..d2e68ff 100644
--- a/dip3.css
+++ b/dip3.css
@@ -12,7 +12,6 @@ h1{background:papayawhip;color:#000;width:100%;margin:0}
 #index h2{margin-left:1.75em}
 #index h3{margin-left:3.5em}
 pre{white-space:pre-wrap;font-size:medium;line-height:2.154}
-cite{font-style:normal}
 img{border:0}
 .framed{border:1px solid}
 pre,blockquote{line-height:2.154;margin:2.154em 0;padding:0 0 0 2.154em;border-left:1px dotted}
diff --git a/index.html b/index.html
index 30ddca2..70b11c8 100644
--- a/index.html
+++ b/index.html
@@ -2,15 +2,16 @@
 <html lang="en">
 <head>
 <meta charset="utf-8">
-<title>Dive into Python 3</title>
+<title>Dive Into Python 3</title>
 <link rel="stylesheet" type="text/css" href="dip3.css">
 <meta name="description" content="This book lives at diveintopython3.org.  If you're reading it somewhere else, you may not have the latest version.">
 <meta name="keywords" content="Python, Python 3, Dive Into Python 3, tutorial, programming, documentation, book, free">
 <meta name="description" content="Python 3 from novice to pro">
 </head>
 <body id="index">
-<p><cite>Dive into Python 3</cite> will cover Python 3 and its differences from Python 2.  Compared to the original <cite><a href="http://diveintopython.org/">Dive into Python</a></cite>, it will be about 50% revised and 50% new material.  I will publish drafts online as I go.  The final book will be published on paper by Apress.  The book will remain online under the <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a> license.</p>
-<p>Below is the draft table of contents.  Only a few chapters have been written so far.  Yes, that is <code>PapayaWhip</code>.  All hail <code>PapayaWhip</code>.</p>
+<p><cite>Dive Into Python 3</cite> will cover Python 3 and its differences from Python 2.  Compared to the original <cite><a href="http://diveintopython.org/">Dive Into Python</a></cite>, it will be about 50% revised and 50% new material.  I will publish drafts online as I go.  The final book will be published on paper by Apress.  The book will remain online under the <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a> license.</p>
+<p>Below is the draft table of contents.  It is <b>not finalized</b>.  Only a few chapters have been written so far.  The rest is just stubs and random notes to myself.</p>
+<p>Yes, that is <code>PapayaWhip</code>.  All hail <code>PapayaWhip</code>.</p>
 
 <section>
 <h1>Installing Python</h1>
@@ -755,7 +756,36 @@
 </section>
 
 <section>
-<h1>Case study: porting <code>chardet</code> to Python 3</h1>
+<h1><a href="case-study-porting-chardet-to-python-3.html">Case study: porting <code>chardet</code> to Python 3</a></h1>
+
+<section>
+<h2><a href="#divingin">Diving in</a></h2>
+</section>
+
+<section>
+<h2><a href="#running2to3">Running <code class="filename">2to3</code></a></h2>
+</section>
+
+<section>
+<h2><a href="#falseisinvalidsyntax"><code>False</code> is invalid syntax</a></h2>
+</section>
+
+<section>
+<h2><a href="#nomodulenamedconstants">No module named <code class="filename">constants</code></a></h2>
+</section>
+
+<section>
+<h2><a href="#namefileisnotdefined">Name '<var>file</var>' is not defined</a></h2>
+</section>
+
+<section>
+<h2><a href="#cantuseastringpattern">Can't use a string pattern on a bytes-like object</a></h2>
+</section>
+
+<section>
+<h2><a href="#cantconvertbytesobject">Can't convert '<code>bytes</code>' object to <code>str</code> implicitly</a></h2>
+</section>
+
 </section>
 
 <section>
@@ -850,15 +880,6 @@
 
 </section>
 
-<section>
-<h1><del>SOAP web services</del></h1>
-
-<section>
-<h2>...no one will miss you...</h2>
-</section>
-
-</section>
-
 <section>
 <h1><del>Functional programming</del></h1>
 
@@ -868,6 +889,15 @@
 
 </section>
 
+<section>
+<h1><del>SOAP web services</del></h1>
+
+<section>
+<h2>...no one will miss you...</h2>
+</section>
+
+</section>
+
 <footer>
 <p class="c">This site is optimized for Lynx just because fuck you.<br>I'm told it also looks good in graphical browsers.</p>
 <p class="c">&copy; 2001-4, 2009 Mark Pilgrim, <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a></p>
diff --git a/porting-code-to-python-3-with-2to3.html b/porting-code-to-python-3-with-2to3.html
index 7a07914..3b8717f 100644
--- a/porting-code-to-python-3-with-2to3.html
+++ b/porting-code-to-python-3-with-2to3.html
@@ -5,7 +5,7 @@
 <title>Porting code to Python 3 with 2to3 - Dive into Python 3</title>
 <link rel="stylesheet" type="text/css" href="dip3.css">
 <style type="text/css">
-body{counter-reset:h1 18}
+body{counter-reset:h1 19}
 </style>
 <script type="text/javascript">
 window.onload = function() {
@@ -1698,6 +1698,10 @@ except:
 
 </section>
 
+<footer>
+<p class="c">&copy; 2001-4, 2009 Mark Pilgrim, <a rel="license" href="http://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a></p>
+</footer>
+
 </body>
 </html>
 
