diff --git a/doc/TODO b/doc/TODO
index aee6382884..b8a07a6983 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -5,6 +5,7 @@ SPEC    - Spec not finalized
 N       - nick claims
 R       - arma claims
 P       - phobos claims
+J       - Jeff claims
         - Not done
         * Top priority
         . Partially done
@@ -225,13 +226,11 @@ N   - Hack up a client that gives out weird/no certificates, so we can
     . Finish path-spec.txt
 
 P - Packaging:
-P   - Can we switch to polipo?  Please?
+P   - Can we switch to polipo? 
 P    - Make documentation realize that location of system configuration file
       will depend on location of system defaults, and isn't always /etc/torrc.
-P   - If we haven't replaced privoxy, lock down its configuration in all
-      packages, as documented in tor-doc-unix.html
 P - Figure out why dll's compiled in mingw don't work right in WinXP.
-P - Create packages for Nokia 800, requested by Chris Soghoian
+  - Create packages for Nokia 800, requested by Chris Soghoian
 P - Consider creating special Tor-Polipo-Vidalia test packages,
     requested by Dmitri Vitalev
   o Get Vidalia supporting protocolinfo and using auth by default.
@@ -549,14 +548,14 @@ P - Setup repos for redhat and suse rpms & start signing the rpms the
     way package management apps prefer
 
 Website:
-P  - tor-in-the-media page
-  X more pictures from ren. he wants to describe the tor handshake
-  - Figure out licenses for website material.
+J  - tor-in-the-media page
+P  - Figure out licenses for website material.
 P  - put the logo on the website, in source form, so people can put it on
     stickers directly, etc.
 P  - put the source image for the stickers on the website, so people can
     print their own
-P - figure out a license for the logos and docs we publish
+P - figure out a license for the logos and docs we publish (trademark
+figures into this)
 R - make a page with the hidden service diagrams.
 P  - ask Jan/Jens to be the translation coordinator? add to volunteer page.
   - add a page for localizing all tor's components.
@@ -564,5 +563,5 @@ P  - ask Jan/Jens to be the translation coordinator? add to volunteer page.
     tor-related tools you can use, and what they give you, and how well they
     work.  Right now, we don't give a lot of guidance wrt
     torbutton/foxproxy/privoxy/polipo in any consistent place.
-  - the tor mirror pages are probably still mirroring from tor.eff.org.
+P  - the tor mirror pages are probably still mirroring from tor.eff.org.
     Get them to switch, and maybe remove the ones that haven't switched?