diff --git a/INSTALL b/INSTALL
index 0e965b7..2f150fe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 For install instructions in non-English languages, see the wiki:
-    http://wiki.phpldapadmin.info
+    http://phpldapadmin.wiki.sourceforge.net
 
 * Requirements
 
@@ -17,7 +17,7 @@ For install instructions in non-English languages, see the wiki:
 * For additional help
 
   See the wiki:
-    http://wiki.phpldapadmin.info
+    http://phpldapadmin.wiki.sourceforge.net
 
   Join our mailing list: 
     https://lists.sourceforge.net/lists/listinfo/phpldapadmin-devel
diff --git a/VERSION b/VERSION
index 88205e3..96cc9d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-$Name: RELEASE-1_1_0 $
+$Name: RELEASE-1_1_0_1 $
diff --git a/htdocs/cmd.php b/htdocs/cmd.php
index 4c9a579..920aa5f 100644
--- a/htdocs/cmd.php
+++ b/htdocs/cmd.php
@@ -1,7 +1,8 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/cmd.php,v 1.3 2007/12/15 13:17:43 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/cmd.php,v 1.3.2.1 2007/12/21 12:11:55 wurley Exp $
 
 /**
+ * @package phpLDAPadmin
  */
 
 require_once './common.php';
diff --git a/htdocs/common.php b/htdocs/common.php
index ce6a032..13b2037 100644
--- a/htdocs/common.php
+++ b/htdocs/common.php
@@ -1,5 +1,10 @@
 <?php
-# This is a temporary file
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/common.php,v 1.3.2.1 2007/12/21 12:11:55 wurley Exp $
+
+/**
+ * @package phpLDAPadmin
+ */
+
 @define('LIBDIR',sprintf('%s/',realpath('../lib/')));
 require_once LIBDIR.'common.php';
 ?>
diff --git a/htdocs/draw_tree_node.php b/htdocs/draw_tree_node.php
index cf3620e..7839d0a 100644
--- a/htdocs/draw_tree_node.php
+++ b/htdocs/draw_tree_node.php
@@ -1,4 +1,10 @@
 <?php
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/draw_tree_node.php,v 1.2.2.1 2007/12/21 12:11:55 wurley Exp $
+
+/**
+ * @package phpLDAPadmin
+ */
+
 	$entry['dn'] = get_request('dn','REQUEST');
 	$entry['server_id'] = get_request('server_id','REQUEST');
 	$entry['code'] = get_request('code','REQUEST');
diff --git a/htdocs/timeout.php b/htdocs/timeout.php
index 73ba493..dcc7b1b 100644
--- a/htdocs/timeout.php
+++ b/htdocs/timeout.php
@@ -1,4 +1,6 @@
 <?php
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/timeout.php,v 1.5.2.1 2007/12/21 12:11:55 wurley Exp $
+
 /**
  * Time out page to be displayed on the right frame
  *
diff --git a/index.php b/index.php
index 3e836dd..a903b2e 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,10 @@
 <?php
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/index.php,v 1.2.2.1 2007/12/21 12:11:55 wurley Exp $
+
+/**
+ * @package phpLDAPadmin
+ */
+
 # You should secure your PLA by making the htdocs/ your docroot.
 header('Location: htdocs/index.php');
 die();
diff --git a/lib/EntryWriter1.php b/lib/EntryWriter1.php
index 511822f..f02618a 100644
--- a/lib/EntryWriter1.php
+++ b/lib/EntryWriter1.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3 2007/12/15 09:01:35 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3.2.1 2007/12/21 11:32:59 wurley Exp $
 
 define('IdEntryRefreshMenuItem', '0');
 define('IdEntryExportBaseMenuItem', '1');
@@ -1777,7 +1777,19 @@ class EntryWriter1 extends EntryWriter {
 	}
 
 	protected function getAttributeDefaultValueHelper($attribute, $i) {
-		return '';
+		$params = $attribute->getProperty('helper');
+
+		# Should only return 1 default entry.
+		if (isset($params['value']) && ! is_array($params['value']))
+			return $params['value'];
+
+		# If there are multiple values, return the first one.
+		else if (isset($params['value']) && is_array($params['value']))
+			return array_shift($params['value']);
+
+		# No default values, return a blank.
+		else
+			return '';
 	}
 
 	protected function getAttributeRenameMenuItem($attribute) {
diff --git a/lib/config_default.php b/lib/config_default.php
index a492b50..def3647 100644
--- a/lib/config_default.php
+++ b/lib/config_default.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/config_default.php,v 1.27 2007/12/15 11:38:59 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/config_default.php,v 1.27.2.1 2007/12/20 10:47:20 wurley Exp $
 
 /**
  * Configuration processing and defaults.
@@ -186,7 +186,7 @@ class Config {
 
 		$this->default->appearance['tree'] = array(
 			'desc'=>'Class name which inherits from Tree class and implements the draw() method',
-			'default'=>'HTMLTree');
+			'default'=>'AJAXTree');
 
 		$this->default->appearance['entry_factory'] = array(
 			'desc'=>'Class name which inherits from EntryFactory class',
diff --git a/lib/createlm.php b/lib/createlm.php
index e92eb4d..5ba6a63 100644
--- a/lib/createlm.php
+++ b/lib/createlm.php
@@ -1,6 +1,6 @@
 <?php
 /*
-$Id: createlm.php,v 1.4 2007/12/15 07:50:32 wurley Exp $
+$Id: createlm.php,v 1.4.2.1 2007/12/21 12:11:55 wurley Exp $
 
   This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
   Copyright (C) 2004 - 2006 Roland Gruber
@@ -27,8 +27,6 @@ $Id: createlm.php,v 1.4 2007/12/15 07:50:32 wurley Exp $
 * The code is a conversion from createntlm.pl (Benjamin Kuit) and smbdes.c/md4.c (Andrew Tridgell).
 *
 * @author Roland Gruber
-*
-* @package modules
 */
 
 /**
@@ -36,7 +34,7 @@ $Id: createlm.php,v 1.4 2007/12/15 07:50:32 wurley Exp $
 *
 * The important functions are lmhash($password) and nthash($password).
 *
-* @package modules
+* @package lam
 */
 class smbHash {
 
diff --git a/lib/emuhash_functions.php b/lib/emuhash_functions.php
index ee3ede5..b6727b2 100644
--- a/lib/emuhash_functions.php
+++ b/lib/emuhash_functions.php
@@ -1,9 +1,6 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/emuhash_functions.php,v 1.6 2005/03/25 00:59:48 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/emuhash_functions.php,v 1.6.10.1 2007/12/21 12:11:55 wurley Exp $
 
-/**
- * @package other
- */
 /*******************************************************************************
  * emuhash - partly emulates the php mhash functions
  * version: 2004040701
diff --git a/lib/functions.php b/lib/functions.php
index 8c5651a..84085aa 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.303 2007/12/15 07:50:32 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.303.2.1 2007/12/16 11:02:40 wurley Exp $
 
 /**
  * A collection of functions used throughout phpLDAPadmin.
@@ -1869,7 +1869,7 @@ function dn_unescape($dn) {
  */
 function get_href($type,$extra_info='') {
 	$sf = 'https://sourceforge.net';
-	$pla = 'http://wiki.phpldapadmin.info';
+	$pla = 'http://phpldapadmin.wiki.sourceforge.net';
 	$group_id = '61828';
 	$bug_atid = '498546';
 	$rfe_atid = '498549';
diff --git a/lib/page.php b/lib/page.php
index 0d68995..5a38b6c 100644
--- a/lib/page.php
+++ b/lib/page.php
@@ -1,22 +1,23 @@
 <?php
-// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/page.php,v 1.3 2007/12/15 13:17:43 wurley Exp $
+// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/page.php,v 1.3.2.5 2007/12/21 12:51:28 wurley Exp $
 
 /**
  * Page Rendering Functions
+ * @package phpLDAPadmin
  */
 
 class page {
 	# pre-HTML headers
-	private $_pageheader;
+	protected $_pageheader;
 
 	# Items to get into the <head>
-	private $_head;
+	protected $_head;
 
 	# Settings for this application
-	private $_app;
+	protected $_app;
 
 	# Default values array.
-	private $_default;
+	protected $_default;
 
 	public function __construct($server_id=null) {
 		if (defined('DEBUG_ENABLED') && DEBUG_ENABLED)
@@ -34,15 +35,20 @@ class page {
 
 		# Capture any output so far (in case we send some headers below) - there shouldnt be any output anyway.
 		$preOutput = '';
-		if (ob_get_level()) {
+
+		# Try and work around if php compression is on, or the user has set compression in the config.
+		# type = 1 for user gzip, 0 for php.ini gzip.
+		$obStatus = ob_get_status();
+		if ($obStatus['type'] && $obStatus['status']) {
 			$preOutput = ob_get_contents();
 			ob_end_clean();
 		}
 
-		//header('Content-type: text/html; charset="UTF-8"'); @todo: Something is sending output to the browser.
+		header('Content-type: text/html; charset="UTF-8"');
 		if (isset($_SESSION['plaConfig'])
 			&& $_SESSION['plaConfig']->GetValue('appearance','compress')
-			&& eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) {
+			&& eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])
+			&& ! ini_get('zlib.output_compression')) {
 
 			header('Content-Encoding: gzip');
 
@@ -50,6 +56,11 @@ class page {
 				debug_log('Sent COMPRESSED header to browser and discarded (%s)',129,__FILE__,__LINE__,__METHOD__,$preOutput);
 		}
 
+		if (isset($_SESSION['plaConfig'])
+			&& $_SESSION['plaConfig']->GetValue('appearance','compress')
+			&& ini_get('zlib.output_compression'))
+				$this->setsysmsg(array(array('title'=>_('Warning'),'body'=>_('WARNING: You cannot have PHP compression and phpLDAPadmin compression enabled at the same time. Please unset zlib.output_compression or set $config->custom->appearance[\'compress\']=false'),'type'=>'warn')));
+
 		# Turn back on output buffering.
 		ob_start();
 
@@ -321,6 +332,7 @@ class page {
 
 		if ($compress && ob_get_level() && isset($_SESSION['plaConfig'])
 			&& $_SESSION['plaConfig']->GetValue('appearance','compress')
+			&& ! ini_get('zlib.output_compression')
 			&& eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) {
 
 			$output = ob_get_contents();
@@ -400,6 +412,7 @@ class page {
 		# compress output
 		if (ob_get_level() && isset($_SESSION['plaConfig'])
 			&& $_SESSION['plaConfig']->GetValue('appearance','compress')
+			&& ! ini_get('zlib.output_compression')
 			&& eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) {
 
 			$output = ob_get_contents();
diff --git a/locale/fi_FI/LC_MESSAGES/messages.mo b/locale/fi_FI/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000..6a1d008
Binary files /dev/null and b/locale/fi_FI/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 8792641..ae192e5 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index e25a36d..391fcc4 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -1,7 +1,7 @@
 # : $
 msgid ""
 msgstr ""
-"Project-Id-Version: phpldapadmin $Name: RELEASE-1_1_0 $\n"
+"Project-Id-Version: phpldapadmin messages\n"
 "Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sf.net\n"
 "POT-Creation-Date: 2007-12-03 11:45+0200\n"
 "PO-Revision-Date: 2007-12-04 18:22+0100\n"
diff --git a/tools/po/make_mo_all b/tools/po/make_mo_all
index d20f245..759bf27 100755
--- a/tools/po/make_mo_all
+++ b/tools/po/make_mo_all
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-HOME=$PWD
+HOME=$PWD/$(dirname $0)
 cd ../../locale
 
 for i in $(ls -1); do
diff --git a/tools/po/messages.header b/tools/po/messages.header
index 6872e56..8782e0f 100644
--- a/tools/po/messages.header
+++ b/tools/po/messages.header
@@ -3,7 +3,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: phpldapadmin $Name: RELEASE-1_1_0 $\n"
+"Project-Id-Version: phpldapadmin messages\n"
 "Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sf.net\n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
 "PO-Revision-Date: 2004-01-14 17:45+0200\n"