diff --git a/AUTHORS b/AUTHORS
index e69de29bb..a5b620ef0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -0,0 +1,4 @@
+Matthew Allum <mallum@o-hand.com> - primary authour
+Emmanuele Bassi <ebassi@o-hand.com> - python bindings, gobject/glib mastery
+Iain Holmes <iain@o-hand.com> - GTK Clutter widget
+Jorn Baayen <jorn@o-hand.com> - Gstreamer bits
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index f0de4dfb1..6c6b6734a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-14  Matthew Allum  <mallum@openedhand.com>
+
+	* AUTHORS:
+	* README:
+	* TODO:
+	Update all.
+
 2006-06-13  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/clutter-video-texture.c:
diff --git a/README b/README
index 54d37132f..86b6696aa 100644
--- a/README
+++ b/README
@@ -1,14 +1,21 @@
+Clutter README.
+===============
 
+Clutter aims to give a nice easy GObject based API for creating fast,
+mainly 2D single window stylalised applications such as media box
+UI's, presentaions, kiosk style apps etc. It uses OpenGL for rendering.
 
-What it will do:
- 
- - Give a nice easy GObject based API for creating fast, mainly 2D
-   single window stylalised applications such as media box UI's, 
-   presentaions, kiosk style apps etc.
-   
- - If you've ever used Director, thats the kind of functionality, 
-   clutter aims for. 
+Its not meant to be a full featured GUI toolkit for regular desktop
+apps nor provide a general interface to *all* openGL functionality.
 
-What it wont do:
+It currently uses fairly low end GL functionality with an aim to still
+work well on open source graphics drivers as well as possibly making
+an eventual GL ES port feasable.
 
- - Provide a general interface to all openGL functionality
+Clutter currently requires GLib >= 2.8, GdkPixbuf, Gstreamer 0.10 and
+OpenGL >= 1.2. Its also recommended you have some kind of working
+hardware OpenGL on your target system.
+
+Clutter is LGPL licensed.
+
+If you want to hack on and improve clutter check the TODO file.
diff --git a/TODO b/TODO
index c557c3d51..ca57f212f 100644
--- a/TODO
+++ b/TODO
@@ -1,39 +1,26 @@
 TODO
 ====
 
-- Element
-  o depth and z positioning ?
-  o can glscale -1 for mirroring / flipping, or just use rotation ?
+Posiible New Features
+==
 
-- Stage
- o Events - mouse
+ - Gradients
+ - Audio only object implementing ClutterMedia Interface.
+ - Some kind of glitz/cairo integration - a GlitzDrawable Actor ?
+ - Improve clutter label usage as to expose more pango functionality.
+ - More portability - GL ES, DirectFB?, Windows, Mac ?
+ - Overhaul co-ordinate system ( more precision ? )
 
-- Texture
- o display lists ?
+Optimisations
+==
 
-- Rect
- o rounded
- o gradients ( or add to elements ? )
- o general polygon handler ?
-
-- Video Texture
- o complete API from bacon-video-widget *Mostly done*
- o Work with pixel aspect and use this info to size element correctly ?
- o mostly rewrite or check with orig author for LGPL.
-
-- Group
- o apply tranforms to group of elements
- o scissor to clip
- o sizing ? how does set/get_geometry affect ?
- o stacking orders with 'depth' value.
-
-- GST
- o Fix FIXME's
- o Remove and use fake sinc instead
-
-- Audio api for sound effects etc
-
-- Document, Document, Document!
- o fix GTK Doc set up with index, grouping etc
-
-- Glitz integration ?
\ No newline at end of file
+ - Display lists.
+ - labels being more conservative on texture creation.
+ - Custom source rather than idle handler for paints ?
+ 
+Other
+==
+ - Unit tests
+ - Much improved examples / demos
+ - Sort Documentation
+ - Bindings to languages other than just Python.