diff --git a/doc/en/Gtk/CellRendererText.xml b/doc/en/Gtk/CellRendererText.xml
index fd33dfe95..2f05b315e 100644
--- a/doc/en/Gtk/CellRendererText.xml
+++ b/doc/en/Gtk/CellRendererText.xml
@@ -1,8 +1,9 @@
 <Type Name="CellRendererText" FullName="Gtk.CellRendererText">
-  <TypeSignature Language="C#" Value="public class CellRendererText : Gtk.CellRenderer, IWrapper, IDisposable" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class CellRendererText : Gtk.CellRenderer, IWrapper, IDisposable" Maintainer="John Luke" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey></AssemblyPublicKey>
+    <AssemblyPublicKey>
+    </AssemblyPublicKey>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
@@ -82,12 +83,14 @@
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Sets the height of a renderer to explicitly be determined by the <see cref="P:Gtk.CellRendererText.Font" />.</summary>
         <param name="value">an object of type <see cref="T:System.Int32" /></param>
         <returns>an object of type <see cref="T:System.Int32" /></returns>
-        <remarks>To be added</remarks>
+        <remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Size">
@@ -96,7 +99,8 @@
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font size.</summary>
         <param name="value">an object of type <see cref="T:System.Int32" /></param>
@@ -110,7 +114,8 @@
       <ReturnValue>
         <ReturnType>System.Double</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font scaling factor.</summary>
         <param name="value">an object of type <see cref="T:System.Double" /></param>
@@ -124,7 +129,8 @@
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Foreground color as a string.</summary>
         <param name="value">an object of type <see cref="T:System.String" /></param>
@@ -138,7 +144,8 @@
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Whether to strike through the text.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -152,7 +159,8 @@
       <ReturnValue>
         <ReturnType>Pango.FontDescription</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>The font description as a <see cref="T:Pango.FontDescription" /></summary>
         <param name="value">an object of type <see cref="T:Pango.FontDescription" /></param>
@@ -166,7 +174,8 @@
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font description as a <see cref="T:System.String" />.</summary>
         <param name="value">an object of type <see cref="T:System.String" /></param>
@@ -180,7 +189,8 @@
       <ReturnValue>
         <ReturnType>System.Double</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font size in points.</summary>
         <param name="value">an object of type <see cref="T:System.Double" /></param>
@@ -194,7 +204,8 @@
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Offset of text above the baseline (below the baseline if rise is negative).</summary>
         <param name="value">an object of type <see cref="T:System.Int32" /></param>
@@ -208,7 +219,8 @@
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Text to render.</summary>
         <param name="value">an object of type <see cref="T:System.String" /></param>
@@ -222,7 +234,8 @@
       <ReturnValue>
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font weight.</summary>
         <param name="value">an object of type <see cref="T:System.Int32" /></param>
@@ -236,7 +249,8 @@
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Background color as a <see cref="T:System.String" />.</summary>
         <param name="value">an object of type <see cref="T:System.String" /></param>
@@ -250,7 +264,8 @@
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Whether the text can be modified by the user.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -264,7 +279,8 @@
       <ReturnValue>
         <ReturnType>Pango.Variant</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font variant.</summary>
         <param name="value">an object of type <see cref="T:Pango.Variant" /></param>
@@ -278,7 +294,8 @@
       <ReturnValue>
         <ReturnType>Gdk.Color</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Background color as a <see cref="T:Gdk.Color" />.</summary>
         <param name="value">an object of type <see cref="T:Gdk.Color" /></param>
@@ -292,7 +309,8 @@
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Name of the font family, e.g. Sans, Helvetica, Times, Monospace.</summary>
         <param name="value">an object of type <see cref="T:System.String" /></param>
@@ -306,7 +324,8 @@
       <ReturnValue>
         <ReturnType>Pango.AttrList</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>A list of style attributes to apply to the text of the renderer.</summary>
         <param name="value">an object of type <see cref="T:Pango.AttrList" /></param>
@@ -320,7 +339,8 @@
       <ReturnValue>
         <ReturnType>Pango.Stretch</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font stretch.</summary>
         <param name="value">an object of type <see cref="T:Pango.Stretch" /></param>
@@ -334,7 +354,8 @@
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Marked up text to render.</summary>
         <param name="value">an object of type <see cref="T:System.String" /></param>
@@ -348,7 +369,8 @@
       <ReturnValue>
         <ReturnType>Pango.Style</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Font style.</summary>
         <param name="value">an object of type <see cref="T:Pango.Style" /></param>
@@ -362,7 +384,8 @@
       <ReturnValue>
         <ReturnType>Pango.Underline</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Style of underline for this text.</summary>
         <param name="value">an object of type <see cref="T:Pango.Underline" /></param>
@@ -376,7 +399,8 @@
       <ReturnValue>
         <ReturnType>Gdk.Color</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Foreground color as a <see cref="T:Gdk.Color" />.</summary>
         <param name="value">an object of type <see cref="T:Gdk.Color" /></param>
@@ -392,8 +416,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
+        <summary>Emitted when the cell is edited.</summary>
+        <remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/doc/en/Gtk/CellRendererToggle.xml b/doc/en/Gtk/CellRendererToggle.xml
index d32c92d66..22df422c0 100644
--- a/doc/en/Gtk/CellRendererToggle.xml
+++ b/doc/en/Gtk/CellRendererToggle.xml
@@ -1,8 +1,9 @@
 <Type Name="CellRendererToggle" FullName="Gtk.CellRendererToggle">
-  <TypeSignature Language="C#" Value="public class CellRendererToggle : Gtk.CellRenderer, IWrapper, IDisposable" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class CellRendererToggle : Gtk.CellRenderer, IWrapper, IDisposable" Maintainer="John Luke" />
   <AssemblyInfo>
     <AssemblyName>gtk-sharp</AssemblyName>
-    <AssemblyPublicKey></AssemblyPublicKey>
+    <AssemblyPublicKey>
+    </AssemblyPublicKey>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
@@ -82,7 +83,8 @@
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>The <see cref="T:Gtk.ToggleButton" /> can be activated.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -96,7 +98,8 @@
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>The toggle state of the <see cref="T:Gtk.ToggleButton" />.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -110,7 +113,8 @@
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>Draw the <see cref="T:Gtk.ToggleButton" /> as a <see cref="T:Gtk.RadioButton" />.</summary>
         <param name="value">an object of type <see cref="T:System.Boolean" /></param>
@@ -152,7 +156,8 @@
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
-      <Parameters></Parameters>
+      <Parameters>
+      </Parameters>
       <Docs>
         <summary>The inconsistent state of the button.</summary>
         <param name="value">a <see cref="T:System.Boolean" /></param>
diff --git a/doc/en/Gtk/TODO b/doc/en/Gtk/TODO
index 5e4934c99..ad693b035 100644
--- a/doc/en/Gtk/TODO
+++ b/doc/en/Gtk/TODO
@@ -1,6 +1,6 @@
 TODO doc for Gtk namespace.
 
-There are in total 324 xml to document in Gtk. Right now there are 173 xml not documented in any proportion.
+There are in total 324 xml to document in Gtk. Right now there are 170 xml not documented in any proportion.
 The idea is to have a easy way to know what documentation is missing, if you want to help or are helping please take out the xml that you commit
 from the missing list. For documentation that take some time to finish (like HTML, TextBuffer, etc) the best is that you but your name and email
 next to the file in this list to acknowledge that you are working in it (is recommendable that you suscribe to the mono-docs  mailing list).
@@ -17,9 +17,6 @@ Accelerator.xml
 Arg.xml
 Callback.xml
 CallbackMarshal.xml
-CellRendererPixbuf.xml
-CellRendererText.xml
-CellRendererToogle.xml
 Clipboard.xml
 ClipboardClearFunc.xml
 ClipboardGetFunc.xml