diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index a43759ace2072cdf953d79ecbf1e0c1fbcbb9c56..e79c45c643ddfa8589b0ed3b2bd4214e8963dec1 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -67,12 +67,12 @@ class app {
 
 	public function uses($classes)
     {	
-		$cl = explode(',',$classes);
+		$cl = explode(', ',$classes);
 		if(is_array($cl)) {
 			foreach($cl as $classname){
 				if(!array_key_exists($classname, $this->_loaded_classes)){
-					include_once($this->_conf['classpath'] . '/'.$classname.'.inc.php');
-					$this->$classname = new $classname;
+					require_once($this->_conf['classpath'] . '/'.$classname.'.inc.php');
+					$this->$classname = new $classname();
 					$this->_loaded_classes[$classname] = true;
 				}
 			}
@@ -81,9 +81,9 @@ class app {
 
 	public function load($files)
     {	
-		$fl = explode(',',$files);
+		$fl = explode(',', $files);
 		if(is_array($fl)) {
-			foreach($fl as $file) {
+			foreach($fl as $file){
 				include_once($this->_conf['classpath'] . '/'.$file.'.inc.php');
 			}
 		}
diff --git a/interface/lib/classes/tpl.inc.php b/interface/lib/classes/tpl.inc.php
index 75c30c35fe2db5f917f7d581e708e59d1591dc5b..33566c0759b7037d9cb51dc1676e4486895ddbd3 100644
--- a/interface/lib/classes/tpl.inc.php
+++ b/interface/lib/classes/tpl.inc.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Template Class
+ * 
+ * @author Kelvin Jones <kelvin@kelvinjones.co.uk>   
+ * @copyright  2002 Active Fish Group 
+ * @version 1.1
+ * @package ISPConfig
+ */
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
 // +----------------------------------------------------------------------+
@@ -14,7 +22,7 @@
 // check to avoid multiple including of class
 if (!defined('vlibTemplateClassLoaded')) {
     define('vlibTemplateClassLoaded', 1);
-
+    global $conf;
    	include_once ($conf['classpath'].'/tpl_error.inc.php');
    	include_once ($conf['classpath'].'/tpl_ini.inc.php');
 
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 2012b7d41a37392a29e3d948e99a5cd7402b933c..499671861f6e9a61f382bde2298d9f8bed1ab74e 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -38,35 +38,34 @@ $conf['app_version'] = '3.0.0';
 $conf['modules_available'] 	= 'admin,mail,sites,monitor,client,dns';
 
 
-//** Future Code  - pedro comments
+//** Future Code  - pedro - rfc
 /* Database connection
-	The only time its needed is to connectm otherwise it not needed as 
-	variables aronf the application. Connected and done.
+	The only time paramaters are needed is to connect, otherwise its not needed  
+	variables "around" the application. ie Connected and done.
 	Prefered is an array as $DB in capitals, ie
 	$DB['host'] = 'type'; 
 	$DB['host'] = 'ip';
 	$DB['user'] = 'me';
 	$DB['password'] = 'secret';
-	$DB['database'] = 'persistent_data_stash';
+	$DB['database'] = 'db_name';
 	
 	The connection paramaters are all contained within one array structure
 	With this array structure the connection can be passed around, to functions
-	However it can also leak. and be destroyed eg
-	$db->connect($DB);
+	However it can also leak so it can be destroyed eg
+	$dbClass->connect($DB);
 	unset($DB); // only the paranoid survive
 		
 	Also there is a scenario where we are devloping and using this file
-	and the database paramaters might leak.
+	and the database paramaters might leak into svn etc.
+    (This idea is borrowed from the tikiwiki.org project)
 	To resolve this there is a file called db_local.php.skel which is not detected
-	rename this to db_local.php and edit the paramaters
+	rename this to db_local.php and edit the paramaters.
 	
 	$DB['type']			= 'mysql';
 	$DB['host']			= 'localhost';
 	$DB['database']		= 'ispconfig3';
 	$DB['user']			= 'root';
 	$DB['password']		= '';
-
-	
 */
 
 //** Detect for local database setting or set and load default params
@@ -92,7 +91,7 @@ $conf['rootpath']			= substr(dirname(__FILE__),0,-4);
 $conf['fs_div']				= '/'; // File system divider, \\ on windows and / on linux and unix
 $conf['classpath']			= $conf['rootpath'].$conf['fs_div'].'lib'.$conf['fs_div'].'classes';
 $conf['temppath']			= $conf['rootpath'].$conf['fs_div'].'temp';
-
+//$conf['cache_dir']           = $conf['rootpath'].$conf['fs_div'].'FOOtemp';
 
 define('DIR_TRENNER', $conf['fs_div']);
 define('SERVER_ROOT', $conf['rootpath']);
@@ -100,17 +99,15 @@ define('INCLUDE_ROOT', SERVER_ROOT.DIR_TRENNER.'lib');
 define('CLASSES_ROOT', INCLUDE_ROOT.DIR_TRENNER.'classes');
 
 /* pedro notes ? this stuff is REALLY not necessay */
-/*
 define('DB_TYPE', $conf['db_type']);
 define('DB_HOST', $conf['db_host']);
 define('DB_DATABASE',$conf['db_database']);
 define('DB_USER', $conf['db_user']);
 define('DB_PASSWORD', $conf['db_password']);
-*/
+
 
 //**  External programs
 //$conf["programs"]["convert"]	= "/usr/bin/convert";
-// ?? WTF ?? pedro
 $conf['programs']['wput']		= $conf['rootpath']."\\tools\\wput\\wput.exe";
 
 
@@ -120,7 +117,7 @@ $conf['html_content_encoding']	= 'text/html; charset=iso-8859-1';
 $conf['logo'] 					= 'themes/default/images/mydnsconfig_logo.gif';
 
 //** Default Language
-$conf["language"]                = 'en';
+$conf['language']       = 'en';
 
 //**  Auto Load Modules
 $conf['start_db']		= true;