diff --git a/AUTHORS b/AUTHORS
index 20ff1b9..ec7792c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,7 +6,7 @@ verion of the functionality.
 
 Main designer: Jon Dugan, ESnet
 Original implementation: Seth Elliott, Kaustubh Prabhu (summer students)
-Major overall: Brian Tierney, ESnet
+Many bug fixes and new features: Jef Poskanzer, ESnet
 
 
 -------------------------------------------------
diff --git a/README b/README
index 57b53a9..e35c5a4 100644
--- a/README
+++ b/README
@@ -17,13 +17,51 @@ Supported platforms:
 
 == Building ==
 
-Run:
+./configure; make; make install
 
-./configure
 
-and 
+== Latest version ==
 
-make
+To check out the most recent code, do:  hg clone http://code.google.com/p/iperf/
 
 
+== Bug Reports ==
+
+Before submitting a bug report, try checking out the latest version of the code, and confirm that its not
+already fixed. Then submit to: https://code.google.com/p/iperf/issues/list
+
 For more information see: http://code.google.com/p/iperf/
+
+== Changes from iperf 2.x ==
+
+New options:
+  -V, --verbose             more detailed output than before
+  -J, --json                output in JSON format
+  -Z, --zerocopy            use a 'zero copy' sendfile() method of sending data
+  -O, --omit N              omit the first n seconds (to ignore slowstart)
+  -T, --title str           prefix every output line with this string
+  -F, --file name           xmit/recv the specified file
+  -A, --affinity n/n,m      set CPU affinity
+
+Depricated options:
+
+Plan to add for the next release:
+  -D, --daemon             run the server as a daemon
+
+Not planning to support. If you really miss these options, please submit a request in the issue tracker
+  -d, --dualtest           Do a bidirectional test simultaneously
+  -r, --tradeoff           Do a bidirectional test individually
+  -N, --nodelay            set TCP no delay, disabling Nagle's Algorithm
+  -T, --ttl                time-to-live, for multicast (default 1)
+  -Z, --linux-congestion <algo>  set TCP congestion control algorithm (Linux only)
+  -x, --reportexclude [CDMSV]   exclude C(connection) D(data) M(multicast) S(settings) V(server) reports
+  -y, --reportstyle C      report as a Comma-Separated Values
+
+Also depricated is the ability to set the options via environment variables.
+
+For sample command line usage, see: 
+	http://fasterdata.es.net/performance-testing/network-troubleshooting-tools/iperf-and-iperf3/
+
+
+
+
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 2748cd6..11c6175 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,15 @@
+== iperf 3.0.0 2013-11-15 ==
+  * Added the following new flags
+     -F, --file name           xmit/recv the specified file
+     -A, --affinity n/n,m      set CPU affinity
+     -J, --json                output in JSON format
+     -Z, --zerocopy            use a 'zero copy' method of sending data
+     -O, --omit N              omit the first n seconds
+     -T, --title str           prefix every output line with this string
+  * more useful information in 'vebose' mode
+  * Many bug fixes
+
+
 == iperf 3.0b4 2010-08-02 ==
 
   * Added support for binding to a specific interface (-B)
diff --git a/TODO b/TODO
index 9112e13..06696b7 100644
--- a/TODO
+++ b/TODO
@@ -1,19 +1,6 @@
 
 Current list of things to fix/add to iperf3
 
--  readd -Z option (linux tcp congestion control algoritm)
--  readd flag to set IP_TOS (-S)
--  add debug options and extend verbose mode
--  add more iperf API support and documentation 
--  look for 'XXX' in code and address
--  better packaging/makefile, README, LICENCE, etc files
--  document and verify the 'state machine'. Is it an error to send messages in the wrong order?
-     - e.g.: what is "STREAM_RUNNING" vs "TEST_RUNNING"??
--  add human readable vs machine readable output mode
-     (my idea on this is that "human readable" = compatable with old iperf,
-     and that "machine readable is all name=value pairs -blt )
--  more testing
--  add daemon mode (-D)
--  see issue tracker for other wish list items
+-  see issue tracker for items on the TODO list
 	http://code.google.com/p/iperf/issues/list