diff --git a/e107_files/bbcode/email.bb b/e107_files/bbcode/email.bb
index bad79f215..bb54cce6e 100644
--- a/e107_files/bbcode/email.bb
+++ b/e107_files/bbcode/email.bb
@@ -13,7 +13,7 @@ if($pref['make_clickable'])
 	else
 	{
 		list($p1,$p2) = explode("@",$code_text);
-		$email_text = (CHARSET != "utf-8" && CHARSET != "UTF-8") ? $p1."©".$p2 : $p1."©".$p2;
+		$email_text = (CHARSET != "utf-8" && CHARSET != "UTF-8") ? $p1."©".$p2 : $p1."©".$p2;
 		return "<a rel='external' href='javascript:window.location=\"mai\"+\"lto:\"+\"".$p1."\"+\"@\"+\"".$p2."\";self.close();' onmouseover='window.status=\"mai\"+\"lto:\"+\"".$p1."\"+\"@\"+\"".$p2."\"; return true;' onmouseout='window.status=\"\";return true;'>".$email_text."</a>";
 	}
 }
diff --git a/e107_files/import/e107_import_class.php b/e107_files/import/e107_import_class.php
index 7913c4633..a65e55502 100644
--- a/e107_files/import/e107_import_class.php
+++ b/e107_files/import/e107_import_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/import/e107_import_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-03-16 21:36:32 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/import/e107_import_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
 
 // This must be an incredibly pointless file! But it does allow testing of the basic plugin structure.
 
diff --git a/e107_files/import/import_classes.php b/e107_files/import/import_classes.php
index 42127edd2..6d44c3b70 100644
--- a/e107_files/import/import_classes.php
+++ b/e107_files/import/import_classes.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/import/import_classes.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-03-16 21:36:32 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/import/import_classes.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:13 $
+ * $Author: marj_nl_fr $
+ */
 
 /*
 Root classes for import and saving of data. Application-specific classes build on these
diff --git a/e107_files/import/import_to_e107.php b/e107_files/import/import_to_e107.php
index 240f345fd..7755a2a40 100644
--- a/e107_files/import/import_to_e107.php
+++ b/e107_files/import/import_to_e107.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/import/import_to_e107.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-03-16 21:36:32 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/import/import_to_e107.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
 
 /* 
 Routine manages import from other databases
diff --git a/e107_files/import/import_user_class.php b/e107_files/import/import_user_class.php
index b6605c7e3..b58b1bb09 100644
--- a/e107_files/import/import_user_class.php
+++ b/e107_files/import/import_user_class.php
@@ -1,22 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/import/import_user_class.php,v $
-|     $Revision: 1.1 $
-|     $Date: 2008-03-16 21:36:32 $
-|     $Author: e107steved $
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/import/import_user_class.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
 
 /*
 Class intended to simplify importing of user information from outside.
diff --git a/e107_files/resetcore.php b/e107_files/resetcore.php
index cad766c7b..d0f90e618 100644
--- a/e107_files/resetcore.php
+++ b/e107_files/resetcore.php
@@ -1,23 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/resetcore.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:36 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/resetcore.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
 
 require_once('../class2.php');
 header('Location:'.SITEURL.$FILES_DIRECTORY.'resetcore/resetcore.php');
-exit;
-?>
+exit();
diff --git a/e107_files/shortcode/batch/bbcode_shortcodes.php b/e107_files/shortcode/batch/bbcode_shortcodes.php
index 119575c4e..ef949e16b 100644
--- a/e107_files/shortcode/batch/bbcode_shortcodes.php
+++ b/e107_files/shortcode/batch/bbcode_shortcodes.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $
-|     $Revision: 1.14 $
-|     $Date: 2009-10-23 19:54:48 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $
+ * $Revision: 1.15 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 include_once(e_HANDLER.'shortcode_handler.php');
diff --git a/e107_files/shortcode/batch/comment_shortcodes.php b/e107_files/shortcode/batch/comment_shortcodes.php
index 51b11c223..9675beb28 100644
--- a/e107_files/shortcode/batch/comment_shortcodes.php
+++ b/e107_files/shortcode/batch/comment_shortcodes.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $
-|     $Revision: 1.12 $
-|     $Date: 2009-10-09 15:05:12 $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $
+ * $Revision: 1.13 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 $comment_shortcodes = e107::getScParser()->parse_scbatch(__FILE__);
diff --git a/e107_files/shortcode/batch/contact_shortcodes.php b/e107_files/shortcode/batch/contact_shortcodes.php
index a4134e6de..a8048c031 100644
--- a/e107_files/shortcode/batch/contact_shortcodes.php
+++ b/e107_files/shortcode/batch/contact_shortcodes.php
@@ -1,18 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system  ©Steve Dunstan 2001-2002
-|     http://e107.org jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/contact_shortcodes.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:40 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/contact_shortcodes.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 $contact_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
diff --git a/e107_files/shortcode/batch/download_shortcodes.php b/e107_files/shortcode/batch/download_shortcodes.php
index b38d9dd5c..9faa3a9cb 100644
--- a/e107_files/shortcode/batch/download_shortcodes.php
+++ b/e107_files/shortcode/batch/download_shortcodes.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/download_shortcodes.php,v $
-|     $Revision: 1.18 $
-|     $Date: 2009-07-07 07:32:59 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/download_shortcodes.php,v $
+ * $Revision: 1.19 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 $download_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
diff --git a/e107_files/shortcode/batch/news_archives.php b/e107_files/shortcode/batch/news_archives.php
index 3bd9a5cf6..72fb6d0d9 100644
--- a/e107_files/shortcode/batch/news_archives.php
+++ b/e107_files/shortcode/batch/news_archives.php
@@ -1,17 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/news_archives.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 $news_archive_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
diff --git a/e107_files/shortcode/batch/signup_shortcodes.php b/e107_files/shortcode/batch/signup_shortcodes.php
index 5fd1c533b..33752e459 100755
--- a/e107_files/shortcode/batch/signup_shortcodes.php
+++ b/e107_files/shortcode/batch/signup_shortcodes.php
@@ -1,23 +1,21 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $
-|     $Revision: 1.14 $
-|     $Date: 2009-07-25 07:54:34 $
-|     $Author: marj_nl_fr $
-|
-| Mods to show extended field categories
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $
+ * $Revision: 1.15 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
+
+// Mods to show extended field categories
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 $signup_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
diff --git a/e107_files/shortcode/batch/sitedown_shortcodes.php b/e107_files/shortcode/batch/sitedown_shortcodes.php
index 474e2e8e8..2c5ea6f59 100644
--- a/e107_files/shortcode/batch/sitedown_shortcodes.php
+++ b/e107_files/shortcode/batch/sitedown_shortcodes.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/sitedown_shortcodes.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:41 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/sitedown_shortcodes.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 $sitedown_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
diff --git a/e107_files/shortcode/batch/usersettings_shortcodes.php b/e107_files/shortcode/batch/usersettings_shortcodes.php
index 5d902b122..798f35575 100755
--- a/e107_files/shortcode/batch/usersettings_shortcodes.php
+++ b/e107_files/shortcode/batch/usersettings_shortcodes.php
@@ -1,21 +1,19 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/usersettings_shortcodes.php,v $
-|     $Revision: 1.11 $
-|     $Date: 2009-07-25 07:54:34 $
-|     $Author: marj_nl_fr $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/usersettings_shortcodes.php,v $
+ * $Revision: 1.12 $
+ * $Date: 2009-11-12 14:37:11 $
+ * $Author: marj_nl_fr $
+ */
+
 if (!defined('e107_INIT')) { exit; }
 include_once(e_HANDLER.'shortcode_handler.php');
 $usersettings_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
diff --git a/e107_files/sleight_js.php b/e107_files/sleight_js.php
index 18a68b6a6..20d366a14 100644
--- a/e107_files/sleight_js.php
+++ b/e107_files/sleight_js.php
@@ -1,21 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_files/sleight_js.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:36 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2001-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_files/sleight_js.php,v $
+ * $Revision: 1.2 $
+ * $Date: 2009-11-12 14:37:12 $
+ * $Author: marj_nl_fr $
+ */
 
 // Credit to youngpup.net for sorting the annoyince that is ie for us =)
 // modified to ignore ie 7+ and figure out where it is on the server.