diff --git a/e107_admin/cache.php b/e107_admin/cache.php
index ea9462c50..5a21b3c57 100644
--- a/e107_admin/cache.php
+++ b/e107_admin/cache.php
@@ -9,9 +9,9 @@
  * Cache Administration Area
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/cache.php,v $
- * $Revision: 1.10 $
- * $Date: 2009-08-28 16:10:54 $
- * $Author: marj_nl_fr $
+ * $Revision: 1.11 $
+ * $Date: 2009-11-07 02:28:54 $
+ * $Author: e107coders $
  *
 */
 require_once("../class2.php");
@@ -84,8 +84,8 @@ if (isset($_POST['empty_cache']))
 
 
 
-$syscache_files = glob($e107->file_path.$FILES_DIRECTORY."cache/S_*.*");
-$cache_files = glob($e107->file_path.$FILES_DIRECTORY."cache/C_*.*");
+$syscache_files = glob($e107->file_path.$CACHE_DIRECTORY."S_*.*");
+$cache_files = glob($e107->file_path.$CACHE_DIRECTORY."C_*.*");
 
 $syscache_files_num = count($syscache_files);
 $cache_files_num = count($cache_files);
diff --git a/e107_files/utilities/resetcore.php b/e107_files/utilities/resetcore.php
index bc2120ecd..5e01a6566 100644
--- a/e107_files/utilities/resetcore.php
+++ b/e107_files/utilities/resetcore.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/utilities/resetcore.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2009-07-19 11:44:28 $
-|     $Author: marj_nl_fr $
+|     $Revision: 1.3 $
+|     $Date: 2009-11-07 02:28:59 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -319,7 +319,8 @@ function e_verify() {
 }
 
 function clear_cache() {
-	$dir = "../cache/";
+	// $dir = "../cache/";
+	$dir = e_CACHE;
 	$pattern = "*.cache.php";
 	$deleted = false;
 	$pattern = str_replace(array("\*", "\?"), array(".*", "."), preg_quote($pattern));
diff --git a/e107_handlers/avatar_handler.php b/e107_handlers/avatar_handler.php
index 052dc00b8..0566735f4 100644
--- a/e107_handlers/avatar_handler.php
+++ b/e107_handlers/avatar_handler.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/avatar_handler.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-12-10 16:37:17 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.3 $
+|     $Date: 2009-11-07 02:28:54 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT'))
@@ -26,7 +26,7 @@ function avatar($avatar)
 	global $tp;
 	if (stristr($avatar, '-upload-') !== false)
 	{
-		return e_FILE.'public/avatars/'.str_replace('-upload-', '', $avatar);
+		return e_UPLOAD.'avatars/'.str_replace('-upload-', '', $avatar);
 	}
 	elseif (stristr($avatar, 'Binary') !== false)
 	{
diff --git a/e107_handlers/online_class.php b/e107_handlers/online_class.php
index 78c955b41..6b743b9e4 100755
--- a/e107_handlers/online_class.php
+++ b/e107_handlers/online_class.php
@@ -9,9 +9,9 @@
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/online_class.php,v $
- * $Revision: 1.5 $
- * $Date: 2009-09-21 21:43:44 $
- * $Author: e107steved $
+ * $Revision: 1.6 $
+ * $Date: 2009-11-07 02:28:54 $
+ * $Author: e107coders $
 */
 
 class e_online 
@@ -35,6 +35,7 @@ class e_online
 				}
 			}
 			$online_warncount = $online_bancount * 0.9;		// Set warning threshold at 90% of ban threshold
+			//TODO Add support for all queries. 
 			$page = (strpos(e_SELF, "forum_") !== FALSE) ? e_SELF.".".e_QUERY : e_SELF;
 			$page = (strpos(e_SELF, "comment") !== FALSE) ? e_SELF.".".e_QUERY : $page;
 			$page = (strpos(e_SELF, "content") !== FALSE) ? e_SELF.".".e_QUERY : $page;
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 1545e614e..f464270c5 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
-|     $Revision: 1.112 $
-|     $Date: 2009-11-05 09:15:12 $
+|     $Revision: 1.113 $
+|     $Date: 2009-11-07 02:28:54 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -416,6 +416,10 @@ class e107plugin
 
 	function manage_extended_field($action, $field_name, $field_type, $field_default='', $field_source='')
 	{
+		$mes = e107::getMessage();
+
+		$mes->add("Extended Field: ".$action.": ".$field_name." : ".$field_type, E_MESSAGE_DEBUG);
+		
 		if(!isset($this->module['ue']))
 		{
 			include_once(e_HANDLER.'user_extended_class.php');
@@ -440,6 +444,9 @@ class e107plugin
 		global $e107;
 		$tp = e107::getParser();
 		$sql  = e107::getDb();
+		$mes = e107::getMessage();
+
+		$mes->add("Userclass: ".$action.": ".$class_name." : ".$class_description, E_MESSAGE_DEBUG);
 		
 		if (!$e107->user_class->isAdmin)
 		{
diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php
index 980629460..9b15146a7 100644
--- a/e107_handlers/xml_class.php
+++ b/e107_handlers/xml_class.php
@@ -9,8 +9,8 @@
  * Simple XML Parser
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/xml_class.php,v $
- * $Revision: 1.33 $
- * $Date: 2009-10-24 08:10:46 $
+ * $Revision: 1.34 $
+ * $Date: 2009-11-07 02:28:54 $
  * $Author: e107coders $
 */
 
@@ -843,6 +843,7 @@ class xmlClass
 		if($debug)
 		{
 			// $message = print_r($xmlArray);
+		//	echo "<pre>".print_r($xmlArray,TRUE)."</pre>";
 			return;
 		}
 
@@ -860,7 +861,7 @@ class xmlClass
 				}
 				else
 				{
-					e107::getConfig($type)->addPref($pArray);
+					e107::getConfig($type)->addPref($pArray); // FIXME addPref() doesn't behave the same way as setPref() with arrays. 
 				}
 
 				if($debug == FALSE)