diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 10396e58a..f217a5ca3 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $
-|     $Revision: 1.20 $
-|     $Date: 2009-10-26 01:04:06 $
+|     $Revision: 1.21 $
+|     $Date: 2009-10-26 01:23:19 $
 |     $Author: e107coders $
 |
 | Work in progress - supplementary mailer plugin
@@ -244,7 +244,8 @@ if (($action == 'savedmail') && $sub_par && $mail_id)
 
 function ret_extended_field_list($list_name, $add_blank = FALSE)
 {
-  global $sql;
+	$sql = e107::getDb();
+
   $ret = "<select name='{$list_name}' class='tbox'>\n";
   if ($add_blank) $ret .= "<option value=''>&nbsp;</option>\n";
   
@@ -1208,7 +1209,14 @@ function show_prefs()
 	</tr>
 	
 	<tr>
-		<td>Auto-process script</td><td><b>".$_SERVER['DOCUMENT_ROOT'].e_HANDLER_ABS."bounce_handler.php</b></td>
+		<td>Auto-process script</td><td><b>".substr($_SERVER['DOCUMENT_ROOT'],0,-1).e_HANDLER_ABS."bounce_handler.php</b>";
+		
+	if(!is_executable(e_HANDLER."bounce_handler.php"))
+	{
+		$text .= " <b style='color:red'>IMPORTANT! You need to CHMOD this file to 0755</b>";
+	}
+		
+	$text .= "</td>
 	</tr>		
 	<tr><td>".LAN_MAILOUT_32."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_email' value=\"".$pref['mail_bounce_email']."\" /></td></tr>
 		<tr><td>".LAN_MAILOUT_33."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_pop3' value=\"".$pref['mail_bounce_pop3']."\" /></td></tr>
@@ -1246,7 +1254,12 @@ function show_prefs()
 // Debug modes list any type of data in the generic table - don't believe the column headings!
 function showList($type='massmail')
 {
-  global $sql,$ns,$tp, $images_path;
+  global $images_path;
+  
+  $ns = e107::getRender();
+  $sql = e107::getDb();
+  $tp = e107::getParser();
+  
   $gen = new convert;
   if (!(trim($type))) $type = 'massmail';
   $qry ="SELECT g.*,u.* FROM #generic AS g LEFT JOIN #user AS u ON g.gen_user_id = u.user_id WHERE g.gen_type = '{$type}' ORDER BY g.gen_datestamp DESC";
@@ -1313,7 +1326,9 @@ function showList($type='massmail')
 // Generate list of userclasses, including the number of members in each class.
 function userclasses($name) 
 {
-	global $sql;
+
+	$sql = e107::getDb();
+	
 	$text .= "<select style='width:80%' class='tbox' name='{$name}' >
 		<option value='all'>".LAN_MAILOUT_12."</option>
 		<option value='unverified'>".LAN_MAILOUT_13."</option>
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 602fb90d7..5e6a90232 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -9,8 +9,8 @@
  * Form Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.56 $
- * $Date: 2009-10-24 07:53:25 $
+ * $Revision: 1.57 $
+ * $Date: 2009-10-26 01:23:19 $
  * $Author: e107coders $
  *
 */
@@ -418,6 +418,15 @@ class e_form
 		return "<input type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
 	}
 
+	/**
+	 * 
+	 * @param object $name
+	 * @param object $value
+	 * @param object $action [optional] default is submit
+	 * @param object $label [optional]
+	 * @param object $options [optional]
+	 * @return 
+	 */
 	function admin_button($name, $value, $action = 'submit', $label = '', $options = array())
 	{
 		$btype = 'submit';
diff --git a/e107_handlers/mailout_class.php b/e107_handlers/mailout_class.php
index 2e184a5e3..2b75c6eb7 100644
--- a/e107_handlers/mailout_class.php
+++ b/e107_handlers/mailout_class.php
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     ©Steve Dunstan 2001-2002
+|     �Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/mailout_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2007-12-22 14:49:21 $
-|     $Author: e107steved $
+|     $Revision: 1.2 $
+|     $Date: 2009-10-26 01:23:19 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -142,6 +142,8 @@ class core_mailout
   // Called to show current selection criteria, and optionally allow edit
   // Returns HTML which is displayed in a table cell. Typically we return a complete table
   // $allow_edit is TRUE to allow user to change the selection; FALSE to just display current settings
+ 
+  //TODO - remove HTML markup from this class! (see below)
   
   function show_select($allow_edit = FALSE)
   {