diff --git a/docs/html/config_epggrab.html b/docs/html/config_epggrab.html
new file mode 100644
index 00000000..a0d2c0cc
--- /dev/null
+++ b/docs/html/config_epggrab.html
@@ -0,0 +1,58 @@
+<div class="hts-doc-text">
+
+ <p>
+ This tab is used to configure EPG grabbing capabilities. TVheadend supports
+ a variety of different EPG grabbing mechanisms. These fall into 3 broad
+ categories, within which there are a variety of specific grabber implementations.
+ </p>
+
+ <h2>Grabber Types</h2>
+ <ul>
+  <li>Over the Air (OTA) - these receive EPG data directly from the DVB network. This is often the easiest way to get up and running, and does provide timely updates should scheduling change. However the information isn't always as rich as some of the other grabbers.</li>
+  <li>Interanl - These are grabbers which can be internally initiated from within TVheadend based on IP based grabbing solutions (see below). This can be a quick way to get richer EPG data where you don't have decent OTA support.</li>
+  <li>External - These provide the option to run the grabber scripts externally and to pump the data into TVheadend via Unix domain sockets. It provides more complex configurations using things like cronjob's etc.</li>
+ </ul>
+
+ <h2>Grabber Modules</h2>
+ <ul>
+  <li>EIT    - This is a DVB standards compatible EIT grabber. Typically it will
+  retrieve now/next information, though on some networks there may be more
+  extensive data published.</li>
+  <li>OpenTV - This is a proprietary OTA EPG grabber. Its known to be used on the SKY networks, but others may use it. You need two configuration files to define settings for your particular network, if you don't see yours listed please visit IRC #hts for help.</li>
+  <li>XMLTV  - This is a IP network based scraper, for more information about XMLTV please visit <a href="http://www.xmltv.org">http://www.xmltv.org</a>. To make use of the internal XMLTV grabber you must have tv_find_grabbers installed. If you install new grabbers you will need to restart TVheadend to pick these up asthey're loaded at startup.</li>
+  <li>PyEPG  - This is another IP network based scraper. It currently only supports the Atlas UK system (for which you need a key), but it does provide a very rich EPG data set. For more information see <a href='http://github.com/adamsutton/PyEPG'>http://github.com/adamsutton/PyEPG</a>.</li>
+ </ul>
+
+ <h2>Configuration options</h2>
+ <p>
+ <dl>
+  <dt>Module:
+  <dd>Select which internal grabber to use.
+
+  <dt>Grab interval
+  <dd>Time period between grabs.
+
+  <dt>External interfaces
+  <dd>Check tick boxes for whichever you want to make available, the Path column displays where the unix socket you need to use lives.
+
+  <dt>OTA interfaces
+  <dd>Check tick boxes for whichever you want to use.
+
+ </dl>
+ Changes to any of these settings must be confirmed by pressing the
+  'Save configuration' button before taking effect.
+  </p>
+
+ <h2>Notes</h2>
+  
+ <p>
+ XMLTV/PyEPG - if you are using the internal versions of these modules then
+ you must first configure them (if required) externally as TVHeadend provides
+ no support for this. Once configured though TVheadend will do the rest.
+ </p>
+
+ <p>
+ Mixed grabbers - Although as much as possible is done to avoid contention, generally speaking using a mixture of grabbers should be avoided (where each grabber updates the same channels). They typically tend to contain differing information which results in them "fighting" over which information is correct and can result in a high level of EPG update messages.
+ </p>
+
+</div>
diff --git a/docs/html/config_xmltv.html b/docs/html/config_xmltv.html
deleted file mode 100644
index a47503cd..00000000
--- a/docs/html/config_xmltv.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="hts-doc-text">
-
- <img src="docresources/xmltvtab.png">
-
- <p>
- This tab is used to configure XML-TV. For more information about XML-TV
- and its use, please visit 
- <a href="http://www.xmltv.org">http://www.xmltv.org</a>.
-
- <p>
- Configuration options:
- <dl>
-  <dt>XML-TV Source
-  <dd>Select which grabber to use.
-      When the drop down list is pressed Tvheadend will issue a scan
-      for available grabbers on the host system. This result will be 
-      cached in the web user interface. Thus, if you need to rescan due to
-      a newly installed grabber you must reload the web interface. 
-      (There is no need to restart Tvheadend itself).
-
-      When you select a grabber more information will pop up regarding
-      further configuration of the grabber.
-
-  <dt>Grab interval
-  <dd>Hours between each grab.
-
-  <dt>Enable grabbing
-  <dd>Uncheck this if you wish to disable grabbing.
-  </dl>
-  Changes to any of these settings must be confirmed by pressing the
-  'Save configuration' button before taking effect.
-
- </div>
diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index 3cf34f4d..87ec839e 100644
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -1,12 +1,11 @@
 tvheadend.brands = new Ext.data.JsonStore({
   root: 'entries',
-  // TODO: this is not ALL fields, just those that I'm likely to use here
   fields: [ 'uri', 'title' ],
   autoLoad: true,
   url : 'epgobject',
   baseParams : { op : 'brandList' }
 });
-// TODO: we might want this to periodically update!
+// WIBNI: might want this store to periodically update
 
 tvheadend.ContentGroupStore = new Ext.data.JsonStore({
     root:'entries',
@@ -117,7 +116,6 @@ tvheadend.epgDetails = function(event) {
     }
 
     function showAlternatives (s) {
-      // TODO: must be a way to constrain this
       var e = Ext.get('altbcast')
       html = '';
       if ( s.getTotalCount() > 0 ) {
@@ -126,14 +124,12 @@ tvheadend.epgDetails = function(event) {
           var ab = s.getAt(i).data;
   	      var dt = Date.parseDate(ab.start, 'U');
           html += '<div class="x-epg-desc">' + dt.format('l H:i') + '&nbsp;&nbsp;&nbsp;' + ab.channel + '</div>';
-          // TODO: record option?
         }
       }
       e.dom.innerHTML = html;
     }
     function showRelated (s)
     {
-      // TODO: must be a way to constrain this
       var e = Ext.get('related')
       html = '';
       if ( s.getTotalCount() > 0 ) {
diff --git a/src/webui/static/app/epggrab.js b/src/webui/static/app/epggrab.js
index 30c30b71..5dd90804 100644
--- a/src/webui/static/app/epggrab.js
+++ b/src/webui/static/app/epggrab.js
@@ -176,7 +176,6 @@ tvheadend.epggrab = function() {
       dataIndex : 'path',
       width     : 300,
       sortable  : false,
-      // TODO: editable?
     },
   ]);
 
@@ -258,7 +257,8 @@ tvheadend.epggrab = function() {
   var helpButton = new Ext.Button({
     text    : 'Help',
     handler : function() {
-      alert('TODO: help info');
+      new tvheadend.help('EPG Grab Configuration',
+                         'config_epggrab.html');
     }
   });