diff --git a/class2.php b/class2.php
index 09dcdb480..76a55b480 100644
--- a/class2.php
+++ b/class2.php
@@ -9,9 +9,9 @@
 * General purpose file
 *
 * $Source: /cvs_backup/e107_0.8/class2.php,v $
-* $Revision: 1.166 $
-* $Date: 2009-12-09 20:35:57 $
-* $Author: e107steved $
+* $Revision: 1.167 $
+* $Date: 2009-12-12 11:01:03 $
+* $Author: e107coders $
 *
 */
 //
@@ -211,7 +211,7 @@ $tmp = realpath(dirname(__FILE__).'/'.$HANDLERS_DIRECTORY);
 e107_require_once($tmp.'/e107_class.php');
 unset($tmp);
 
-$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY');
+$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'MEDIA_DIRECTORY','CACHE_DIRECTORY');
 $sql_info = compact('mySQLserver', 'mySQLuser', 'mySQLpassword', 'mySQLdefaultdb', 'mySQLprefix');
 $e107 = e107::getInstance()->initCore($e107_paths, realpath(dirname(__FILE__)), $sql_info);
 
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index effc3a219..d89999424 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -9,9 +9,9 @@
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
- * $Revision: 1.91 $
- * $Date: 2009-12-10 22:46:45 $
- * $Author: secretr $
+ * $Revision: 1.92 $
+ * $Date: 2009-12-12 11:01:03 $
+ * $Author: e107coders $
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -235,6 +235,7 @@ class e107
 			$this->prepare_request();
 
 			// folder info
+			
 			$this->e107_dirs = $e107_paths;
 
 			// mysql connection info
@@ -1656,7 +1657,6 @@ class e107
 			define("e_HANDLER", e_BASE.$HANDLERS_DIRECTORY);
 			define("e_LANGUAGEDIR", e_BASE.$LANGUAGES_DIRECTORY);
 			define("e_DOCS", e_BASE.$HELP_DIRECTORY);
-			//FIXME need another name
 			define("e_MEDIA", e_BASE.$MEDIA_DIRECTORY);
 //
 // HTTP absolute paths
@@ -1668,7 +1668,6 @@ class e107
 			define("e_FILE_ABS", e_HTTP.$FILES_DIRECTORY);
 			define("e_HANDLER_ABS", e_HTTP.$HANDLERS_DIRECTORY);
 			define("e_LANGUAGEDIR_ABS", e_HTTP.$LANGUAGES_DIRECTORY);
-			//FIXME Shouldn't be available
 			define("e_MEDIA_ABS", e_HTTP.$MEDIA_DIRECTORY);
 
 			if(isset($_SERVER['DOCUMENT_ROOT']))
@@ -1688,8 +1687,7 @@ class e107
 			}
 			else
 			{
-            	//FIXME need another name
-							define("e_CACHE", e_MEDIA."cache/");
+ 				define("e_CACHE", e_MEDIA."cache/");
 			}
 /*
 
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 9ebfb601a..b39148208 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -9,9 +9,9 @@
 * Text processing and parsing functions
 *
 * $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
-* $Revision: 1.87 $
-* $Date: 2009-12-07 20:48:04 $
-* $Author: e107steved $
+* $Revision: 1.88 $
+* $Date: 2009-12-12 11:01:04 $
+* $Author: e107coders $
 *
 */
 if (!defined('e107_INIT')) { exit(); }
@@ -1506,7 +1506,7 @@ class e_parse
 				$e107->getFolder('themes'),
 			//	$e107->getFolder('downloads'),
 				$e107->getFolder('handlers'),
-				$e107->getFolder('media')
+				$e107->getFolder('media')				
 			);
 
 			switch ($mode)
@@ -1522,7 +1522,6 @@ class e_parse
 						e_THEME_ABS,
 				//		e_DOWNLOAD_ABS, //impossible when download is done via php.
 						e_HANDLER_ABS,
-						//FIXME Shouldn't be available
 						e_MEDIA_ABS
 					);
 				break;