diff --git a/site/_templates/header.mako b/site/_templates/header.mako
index f5e2fb0..1404089 100644
--- a/site/_templates/header.mako
+++ b/site/_templates/header.mako
@@ -2,7 +2,7 @@
 
     <a id="fork-me" href="http://github.com/jnoller/getpython3.com" target="_new">
         <img
-        src="https://a248.e.akamai.net/assets.github.com/img/abad93f42020b733148435e2cd92ce15c542d320/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" 
+        src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" 
         alt="Fork me on GitHub">
     </a>
 
diff --git a/site/_templates/sections/download.mako b/site/_templates/sections/download.mako
index eba8e66..ef1374b 100644
--- a/site/_templates/sections/download.mako
+++ b/site/_templates/sections/download.mako
@@ -1,35 +1,32 @@
 <h2 id="download-information" class="caps"><span>Download Information</span></h2>
-<p>The most current version of Python 3 is 3.2.2 - here's a list of 
-new things:
+<p>The most current version of Python 3 is 3.3.2 - here's a list of 
+new things added:
 
 <ul>
-    <li>numerous improvements to the unittest module</li>
-    <li>PEP 3147, support for .pyc repository directories</li>
-    <li>PEP 3149, support for version tagged dynamic libraries</li>
-    <li>PEP 3148, a new futures library for concurrent programming</li>
-    <li>PEP 384, a stable ABI for extension modules</li>
-    <li>PEP 391, dictionary-based logging configuration</li>
-    <li>an overhauled GIL implementation that reduces contention</li>
-    <li>an extended email package that handles bytes messages</li>
-    <li>a much improved ssl module with support for SSL contexts and certificate hostname matching</li>
-    <li>a sysconfig module to access configuration information</li>
-    <li>additions to the shutil module, among them archive file support</li>
-    <li>many enhancements to configparser, among them mapping protocol support</li>
-    <li>improvements to pdb, the Python debugger</li>
-    <li>countless fixes regarding bytes/string issues; among them full support for a bytes environment (filenames, environment variables)</li>
-    <li>many consistency and behavior fixes for numeric operations</li>
+    <li><code>yield from</code> expression for delegating to a generator (PEP 380)
+    <li>new library modules for LZMA compression, mock objects for unit tests,
+        and  representing IP addresses
+    <li>the decimal type has been re-implemented in C, making it much faster
+    <li>PEP 393, Flexible String Representation, which reduces memory usage
+        and removes the distinction between narrow and wide builds of Python.
+    <li>PEP 397, a Windows&reg; launcher for *.py files.
+    <li>PEP 405, Python Virtual Environments</li>
+    <li>PEP 3118, new implementation of the memoryview type.</li>
+    <li>PEP 3151, reworked hierarchy of OS and I/O exceptions</li>
+    <li>the <code>import</code> statement is now build atop the importlib module</li>
+    <li>for easier porting to Python 3, the <code>u''</code> syntax is now accepted again</li>
+    <li>security fix: hash randomization is now enabled by default.</li>
 </ul>
 </p>
 
 <p>You can see details on what's changed by looking at the "<a
-href="http://docs.python.org/dev/whatsnew/3.2.html">What's New in 3.2</a>"
-document as well as "<a
-href="http://docs.python.org/release/3.0.1/whatsnew/3.0.html">What's New in
-3.0</a>", and the <a
-href="http://hg.python.org/cpython/file/v3.2.2/Misc/NEWS">change log</a>.
+href="http://docs.python.org/dev/whatsnew/3.3.html">What's New in 3.3</a>"
+document, as well as <a
+href="http://docs.python.org/py3k/whatsnew/">the earlier What's New articles</a>, and the <a
+href="http://hg.python.org/cpython/file/v3.3.0/Misc/NEWS">change log</a>.
 Builds are available for all major platforms, and OS X users can use <a
 href="http://mxcl.github.com/homebrew/">homebrew</a> via
 <b>"brew install python3"</b></p>
 
-<p><a class="btn primary" href="http://python.org/download/releases/3.2.2/">Go Here to
+<p><a class="btn primary" href="http://python.org/download/releases/3.3.0/">Go Here to
 Download &raquo;</a></p>
diff --git a/site/_templates/sections/findprojects.mako b/site/_templates/sections/findprojects.mako
index 6455890..3b975ea 100644
--- a/site/_templates/sections/findprojects.mako
+++ b/site/_templates/sections/findprojects.mako
@@ -1,12 +1,12 @@
 <h2 id="how-to-find-projects" class="caps"><span>How to find projects</span></h2>
-<p>If you are looking to help - but are not the maintainer of a module, library,
-etc there are various ways you can help. For example, see Brett Cannon's
+<p>If you are looking to help &mdash; but are not the maintainer of a module, library,
+etc. &mdash; there are various ways you can help. For example, see Brett Cannon's
 "<a href="http://py3ksupport.appspot.com/">Python 3 Support on PyPI</a>" site,
-that lists out various projects that support, or do not support Python 3. You
-can always find some project there, or elsewhere that can use assistance in
+that lists various projects that support, or do not support Python 3. You
+can always find a project there that can use assistance in
 porting.</p>
 
-<p>Additionally, there are threads and sites out there (such as 
+<p>Additionally, there are threads and sites (such as 
 <a href="https://plus.google.com/u/1/106436370949746015255/posts/SAwkyVyUhWV">
-Tarek's post on google+</a>) where people have come out and voted for libraries 
+Tarek's post on google+</a>) where people have voted for libraries 
 they need ported to Python 3 so they can in turn make the transition.</p>
diff --git a/site/_templates/sections/introduction.mako b/site/_templates/sections/introduction.mako
index e6477cb..54895eb 100644
--- a/site/_templates/sections/introduction.mako
+++ b/site/_templates/sections/introduction.mako
@@ -3,8 +3,6 @@
 - this site aims to be a resource for Python 3 for developers. 
 This includes guides, videos, tutorials and other resources to 
 help you and your team achieve a successful Python 3 port of 
-your application, library, framework or tool. Also included is 
-information on Python Software Foundation financial grants for 
-porting to Python 3, other significant projects working on 
-Python 3, as well as potential information on companies willing 
-to fund or provide grants for Python 3 porting.</p>
+your application, library, framework or tool.  It also covers
+Python Software Foundation financial grants for 
+porting to Python 3.</p>
diff --git a/site/_templates/sections/ports.mako b/site/_templates/sections/ports.mako
index 260adb4..15d4205 100644
--- a/site/_templates/sections/ports.mako
+++ b/site/_templates/sections/ports.mako
@@ -1,10 +1,10 @@
 <h2 id="notable-ports" class="caps"><span>Notable Ports</span></h2>
-<p>The follow libraries/projects and frameworks are notable additions to the
+<p>The following libraries/projects and frameworks are notable additions to the
 Python 3 ecosystem. Some of these represent entire frameworks, while others are
 major dependencies for other projects and tools:
 <ul>
-    <li><a href="http://groups.google.com/group/pylons-discuss/browse_thread/thread/ca67c7bad45fe408?hl=en_US&pli=1">Pyramid 1.3a1</a></li>
-    <li><a href="https://groups.google.com/forum/#!topic/django-developers/XjrX3FIPT-U">Django (Development Branch)</a></li>
+    <li><a href="http://docs.pylonsproject.org/projects/pyramid/en/1.3-branch/whatsnew-1.3.html">Pyramid 1.3</a></li>
+    <li><a href="https://www.djangoproject.com/weblog/2012/aug/19/experimental-python-3-support/">Django (Experimental)</a></li>
     <li><a href="http://www.makotemplates.org/">Mako Templates</a></li>
     <li><a href="http://www.sqlalchemy.org/features.html">SQLAlchemy</a></li>
     <li><a href="http://www.webob.org/">Webob</a></li>
@@ -16,6 +16,6 @@ major dependencies for other projects and tools:
     <li><a href="http://python-requests.org">requests</a></li>
 </ul>
 You can see a semi-complete list of <a
-href="http://pypi.python.org/pypi?:action=browse&c=533&show=all">all Python 3 supporing packages on PyPi
+href="http://pypi.python.org/pypi?:action=browse&c=533&show=all">all Python 3 supporting packages on PyPi
 here</a>.
 </p>
diff --git a/site/_templates/sections/resources.mako b/site/_templates/sections/resources.mako
index 23ae215..a46ecab 100644
--- a/site/_templates/sections/resources.mako
+++ b/site/_templates/sections/resources.mako
@@ -1,6 +1,6 @@
 <h2 id="resources" class="caps"><span>Resources</span></h2>
-<p>There is a wealth of information out there on Porting to, and about
-Python 3. There is an entire mailing list (<a href="http://mail.python.org/mailman/listinfo/python-porting">python-porting</a>)
+<p>There is a wealth of information out there about Python 3 and porting to it.
+There is an entire mailing list (<a href="http://mail.python.org/mailman/listinfo/python-porting">python-porting</a>)
 dedicated to helping people port things to Python 3 - developers
 experienced in porting should join up, and there is already a good
 team there to help support you.</p>
@@ -20,8 +20,8 @@ team there to help support you.</p>
             <div class="span6">
                 <h3>Python 3 Overviews</h3>
                 <ul>
-                    <li><a href="http://docs.python.org/release/3.0.1/whatsnew/3.0.html">What's New in Python 3</a></li>
-                    <li><a href="http://www.linuxjournal.com/content/python-python-python-aka-python-3">Python Python Python (aka Python 3)</a></li>
+                    <li><a href="http://docs.python.org/release/3.0.1/whatsnew/3.0.html">What's New in Python 3.0</a></li>
+                    <li><a href="http://www.linuxjournal.com/content/python-python-python-aka-python-3">Linux Journal: Python Python Python (aka Python 3)</a></li>
                 </ul>
             </div>
         </div>
diff --git a/site/_templates/sections/support.mako b/site/_templates/sections/support.mako
index 1134d22..52dcd84 100644
--- a/site/_templates/sections/support.mako
+++ b/site/_templates/sections/support.mako
@@ -1,7 +1,6 @@
 <h2 id="financial-support" class="caps"><span>Financial support</span></h2>
 
-<p>In short: <b>yes</b> - there's a bevy of information, videos and
-blog posts out there that can help you on your way. Python 3 is 
+<p>Python 3 is 
 the future of the Python language, and entities such as the Python
 Software Foundation strongly believe in supporting the porting effort.
 </p>
diff --git a/site/_templates/sections/whatispython.mako b/site/_templates/sections/whatispython.mako
index b0576ca..7af4d3e 100644
--- a/site/_templates/sections/whatispython.mako
+++ b/site/_templates/sections/whatispython.mako
@@ -1,36 +1,48 @@
 <h2 id="what-is-python-3" class="caps"><span>What is Python 3?</span></h2>
 
-<p>Short version: Although most Python code is written for Python 
+<h3>Short summary</h3>
+
+<p>Although most Python code is currently written for Python 
 2.x, Python 3.x is the present and future of the language.</p>
 
-<p>At the time of writing (Sept 28, 2011), the final 2.7 release 
-is out, with a statement of extended support for this end-of-life 
-release. The 2.x branch will see no new major releases after that. 
-3.x is under active development and has already seen stable 
-releases, such as the recent 3.2. This means that all recent 
-standard library improvements, for example, are only available 
-in Python 3.x.</p>
+<p>Python 2.7.3 was released in April 2012. 
+The 2.x branch will have no further major releases,
+though this end-of-life release will have an extended period of bug
+and security fixes.
+
+<p>Python 3.x continues to be actively developed and has already seen stable
+releases.  The most recent is Python 3.3, released in September
+2012. This means that all recent standard library improvements, for
+example, are only available in Python 3.x.</p>
+
+<h3>Detailed discussion</h3>
 
 <p>Guido van Rossum (the original creator of the Python language), 
-in conjunction with other python-core developers decided to 
-clean up Python 2.x properly, with less regard for backwards 
-compatibility than is the case for new releases in the 2.x range. 
-The most drastic improvement is the better unicode support (with 
-all text strings being unicode by default) as well as saner 
+in conjunction with other python-core developers decided to use Python 3.x to
+clean up Python 2.x.  Python 2.x releases were careful to preserve backwards 
+compatibility with older versions, but Python 3.x was freed of this requirement.
+The most drastic improvement is better Unicode support (with 
+all text strings being Unicode by default) as well as saner 
 bytes/unicode separation.</p>
 
-<p>Besides, several aspects of the core language (such as print 
-and exec being statements, integers using floor division) have been 
+<p>Several other aspects of the core language (such as <code>print</code>
+and <code>exec</code> being statements, integers using floor division) were 
 adjusted to be easier for newcomers to learn and to be more consistent 
 with the rest of the language, and old cruft has been removed (for 
-example, all classes are now new-style, range() returns a memory 
-efficient iterable, not a list as in 2.x).</p>
+example, all classes are now new-style, <code>range()</code> returns a memory 
+efficient iterable and not a list as in 2.x).</p>
 
 <p>The <a href="http://docs.python.org/py3k/whatsnew/3.0.html">
 What's New in Python 3.0</a> document provides a good overview of the 
 major language changes and likely sources of incompatibility with 
 existing Python 2.x code.</p>
 
+<p>The <a href="http://docs.python.org/dev/whatsnew/3.1.html">What's
+New in Python 3.1</a>, 
+<a href="http://docs.python.org/dev/whatsnew/3.2.html">Python 3.2</a>,
+and <a href="http://docs.python.org/dev/whatsnew/3.3.html">Python 3.3</a> 
+documents describes the new features added to each Python 3 release.</p>
+
 <p>Cribbed from <a href="http://wiki.python.org/moin/Python2orPython3"
 target="_blank">Python2orPython3</a> on the Python wiki.</p>
 
diff --git a/site/_templates/base.mako b/site/_templates/site.mako
similarity index 100%
rename from site/_templates/base.mako
rename to site/_templates/site.mako
diff --git a/site/_templates/topbar.mako b/site/_templates/topbar.mako
index a45d9ff..63705c0 100644
--- a/site/_templates/topbar.mako
+++ b/site/_templates/topbar.mako
@@ -5,10 +5,10 @@
         <li class="active"><a href="#overview">Introduction</a></li>
         <li><a href="#what-is-python-3">What is Python 3?</a></li>
         <li><a href="#download-information">Download</a></li>
+        <li><a href="#resources">Resources</a></li>
         <li><a href="#notable-ports">Notable Ports</a></li>
-        <li><a href="#financial-support">Financial Support</a></li>
         <li><a href="#how-to-find-projects">Find Projects</a></li>
-        <li><a href="#resources">Resources</a></li>
+        <li><a href="#financial-support">Financial Support</a></li>
       </ul>
     </div>
   </div><!-- /topbar-inner -->
diff --git a/site/index.html.mako b/site/index.html.mako
index f2b1d6d..5763269 100644
--- a/site/index.html.mako
+++ b/site/index.html.mako
@@ -1,4 +1,4 @@
-<%inherit file="_templates/base.mako" />
+<%inherit file="_templates/site.mako" />
 
 <p class="alert-message block-message error">
     <b>Note</b>: We have mirrored Mark Pilgrim's excellent Dive into 
@@ -38,13 +38,13 @@ ${self.whatispython()}
 
 ${self.download()}
 
-${self.ports()}
+${self.resources()}
 
-${self.support()}
+${self.ports()}
 
 ${self.findprojects()}
 
-${self.resources()}
+${self.support()}
 
 <p class="alert-message block-message info">Source code to this site available
 <a href="https://github.com/jnoller/getpython3.com" target="_blank"> on github.</a></p>