diff --git a/lib/DefaultLookup.inc b/lib/DefaultLookup.inc
index 1eb692e..651e81b 100644
--- a/lib/DefaultLookup.inc
+++ b/lib/DefaultLookup.inc
@@ -1,17 +1,30 @@
 <?php
-
 /**
-* 
-* Class DefaultLookup
-*
-* Represents the base class for any table in the database that ends in a _lookup
-* i.e. any tables containing only an ID and name column
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 19 January 2003
-* @package lib
-*/
-
+ * $Id$
+ *
+ * Represents the base class for any table in the database that ends in a _lookup
+ * i.e. any tables containing only an ID and name column
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib
+ */
 class DefaultLookup {
 	
 	/** database table name */
diff --git a/lib/Log.inc b/lib/Log.inc
index 4cd920d..9fa8bbf 100644
--- a/lib/Log.inc
+++ b/lib/Log.inc
@@ -1,23 +1,34 @@
 <?php
-
 require_once("$default->fileSystemRoot/lib/database/datetime.inc");
-
 // define error levels
 define("DEBUG", 0);
 define("INFO", 1);
 define("ERROR", 2);
-
 /**
  * $Id$
- * 
- * File logging class
- * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * File logging class.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib
- */
+ */ 
 class Log {
     /**
      * The minimum logging level- log everything with
diff --git a/lib/System.inc b/lib/System.inc
index 7e29a7c..0601caa 100644
--- a/lib/System.inc
+++ b/lib/System.inc
@@ -1,20 +1,31 @@
 <?php
-
 require_once("$default->fileSystemRoot/phplib/db_mysql.inc");
 require_once("$default->fileSystemRoot/lib/database/db.inc");
-
-
 /**
  * $Id$
- * 
- * Stores system settings
- * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Stores system settings.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib
- */
+ */ 
 class System {
     
     var $db;
@@ -63,9 +74,9 @@ class System {
     function set($sSettingName, $sSettingValue) {
         global $default, $lang_err_database;
         
-        if (lookupField($default->owl_system_settings_table, "name", "name", $sSettingName)) {
+        if (lookupField($default->system_settings_table, "name", "name", $sSettingName)) {
             // the setting exists, so overwrite it
-            if ($default->db->query("UPDATE $default->owl_system_settings_table SET value='$sSettingValue' where name='$sSettingName'")) {
+            if ($default->db->query("UPDATE $default->system_settings_table SET value='$sSettingValue' where name='$sSettingName'")) {
                 return true;
             } else {
                 $_SESSION["errorMessage"] = $lang_err_database;
@@ -73,7 +84,7 @@ class System {
             }            
         } else {
             // the setting doesn't exist, lets insert it
-            if ($default->db->query("INSERT INTO $default->owl_system_settings_table (name, value) VALUES ('$sSettingName', '$sSettingValue')")) {
+            if ($default->db->query("INSERT INTO $default->system_settings_table (name, value) VALUES ('$sSettingName', '$sSettingValue')")) {
                 return true;
             } else {
                 $_SESSION["errorMessage"] = $lang_err_database;
diff --git a/lib/dms.inc b/lib/dms.inc
index fbcfa2e..a862dd1 100644
--- a/lib/dms.inc
+++ b/lib/dms.inc
@@ -1,13 +1,24 @@
 <?php
-
 /**
- * @package lib
- * 
  * $Id$
  *
  * DMS default routines and functions
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
@@ -53,12 +64,12 @@ if(isset($default->defaultLanguage)) {
     } else {
 
         $sql = $default->db;
-        $sql->query("select * from $default->owl_sessions_table where id = '" . session_id() . "'");       
+        $sql->query("select * from $default->sessions_table where id = '" . session_id() . "'");       
         $sql->next_record();
         $numrows = $sql->num_rows($sql);
         $userID = $sql->f("user_id");
         if($numrows == 1) {
-            $sql->query("select * from $default->owl_users_table where id = $userID");
+            $sql->query("select * from $default->users_table where id = $userID");
             $sql->next_record();
             $language = $sql->f("language");
             // BEGIN wes fix
diff --git a/lib/visualpatterns/NavBar.inc b/lib/visualpatterns/NavBar.inc
index 0cf1b77..2e5e0eb 100644
--- a/lib/visualpatterns/NavBar.inc
+++ b/lib/visualpatterns/NavBar.inc
@@ -1,14 +1,30 @@
 <?php
-
 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
-global $default;
-
 /**
-* Contains all the functions to create the navbar...
-*
-* @author Mukhtar Dharsey
-* @date 22 January 2003
-*/
+ * $Id$
+ *
+ * Contains all the functions to create the Navbar.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ */
 class NavBar {
     //variable used to pass highlighting
     var $home;
diff --git a/lib/visualpatterns/PatternBrowsableSearchResults.inc b/lib/visualpatterns/PatternBrowsableSearchResults.inc
index 6c8e4fc..fcbc999 100644
--- a/lib/visualpatterns/PatternBrowsableSearchResults.inc
+++ b/lib/visualpatterns/PatternBrowsableSearchResults.inc
@@ -1,5 +1,29 @@
 <?php
-
+/**
+ * $Id$
+ *
+ * Renders paginated query results in a table.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ */
 class PatternBrowseableSearchResults {
 	
 	/** query to be executed */
diff --git a/lib/visualpatterns/PatternCreate.inc b/lib/visualpatterns/PatternCreate.inc
index 839f3c6..e087b04 100644
--- a/lib/visualpatterns/PatternCreate.inc
+++ b/lib/visualpatterns/PatternCreate.inc
@@ -1,15 +1,30 @@
 <?php
 /**
-* Class PatternCreate
-*
-* This pattern facilities the creation of new entries in the database using
-* the objects associated with those entries
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 4 February 2003
-* @package presentation.lib.visualpatterns
-*/
-
+ * $Id$
+ *
+ * This pattern facilities the creation of new entries in the database using
+ * the objects associated with those entries.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ */
 class PatternCreate {
 		
 	var $sObject;
diff --git a/lib/visualpatterns/PatternCustom.inc b/lib/visualpatterns/PatternCustom.inc
index 5b56386..3633389 100644
--- a/lib/visualpatterns/PatternCustom.inc
+++ b/lib/visualpatterns/PatternCustom.inc
@@ -1,12 +1,29 @@
 <?php
-
-/** 
- * 
+/**
  * $Id$
  *
- * Used to specify html code that is not catered for by any of the other patterns
+ * Used to specify html code that is not catered for by any of the other patterns.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.visualpatterns
- */
+ */ 
 class PatternCustom {
 	
 	/** Custom HTML string */
diff --git a/lib/visualpatterns/PatternDatabaseTable.inc b/lib/visualpatterns/PatternDatabaseTable.inc
index 67f4c42..b577408 100644
--- a/lib/visualpatterns/PatternDatabaseTable.inc
+++ b/lib/visualpatterns/PatternDatabaseTable.inc
@@ -1,27 +1,38 @@
 <?php
-
 /**
-* 
-* Class PatternDatabaseTable
-*
-* Builds a query using the table name and the array of specified columns
-* and displays the results in an HTML table.  The ID column of the table is
-* included by default (basically renders a database table in html)
-*
-* The first column in the table can be rendered as a link 
-* to the document/folder using the $iLinkType variable to specify the link type,
-* the $sLinkPageURL to specify the page URL to link to and $sLinkImageURL to specify
-* the image to display in the case of either a $iLinkType of 2 (image only) or 3 (image + text)
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 7 January 2003
-*
-* @todo $iLinkImageURL is hard coded - change
-* @todo $sLinkPageURL is hard coded - change
-*
-* @package lib.visualpatterns
-*/
-
+ * $Id$
+ *
+ * Builds a query using the table name and the array of specified columns
+ * and displays the results in an HTML table.  The ID column of the table is
+ * included by default (basically renders a database table in html)
+ *
+ * The first column in the table can be rendered as a link 
+ * to the document/folder using the $iLinkType variable to specify the link type,
+ * the $sLinkPageURL to specify the page URL to link to and $sLinkImageURL to specify
+ * the image to display in the case of either a $iLinkType of 2 (image only) or 3 (image + text)
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ * @todo $iLinkImageURL is hard coded - change
+ * @todo $sLinkPageURL is hard coded - change
+ */
 class PatternDatabaseTable {
 	
 	/* Name of table to query */
diff --git a/lib/visualpatterns/PatternEditableListFromQuery.inc b/lib/visualpatterns/PatternEditableListFromQuery.inc
index 4cc06d1..191dd50 100644
--- a/lib/visualpatterns/PatternEditableListFromQuery.inc
+++ b/lib/visualpatterns/PatternEditableListFromQuery.inc
@@ -1,16 +1,31 @@
 <?php
 /**
-* Class PatternEditableListFromQuery
-* Takes a SQL query, an array of column names and and an array of column types
-* and displays the data in an editable two column list format
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 27 January 2003
-* @package lib.visualpatterns
-*
-* @todo implement HyperLinkURL option
-*/
-
+ * $Id$
+ *
+ * Takes a SQL query, an array of column names and and an array of column types
+ * and displays the data in an editable two column list format.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ * @todo implement HyperLinkURL option 
+ */
 class PatternEditableListFromQuery {
 	
 	/** SQL query to execute */
diff --git a/lib/visualpatterns/PatternEditableTableSqlQuery.inc b/lib/visualpatterns/PatternEditableTableSqlQuery.inc
index 95f8c26..e5356a4 100644
--- a/lib/visualpatterns/PatternEditableTableSqlQuery.inc
+++ b/lib/visualpatterns/PatternEditableTableSqlQuery.inc
@@ -1,29 +1,43 @@
 <?php
-
 /**
-* Class PatternEditableTableSqlQuery
-*
-* Will take a query that generates a table like
-* result and create and editable HTML table from it that can
-* be used as part of a form.  
-*
-* 1 columns is REQUIRED in the Sql query:
-*		o column giving primary key of entry in table (primary key column name specified in $aPrimaryKey)
-*
-* 3 hidden fields are generated for each editable entry:
-*	o <uniquename>_id:		holds the primary key of the entry in the table (-1 = no entry in table i.e. create not update)
-*	o <uniquename>_tn: 		holds the tablename for which the primary key is valid
-*	o <uniquename>_type:	holds the type of entry (text/boolean/list) - for parsing purposes
-*
-* The actual value is held in a form field name <uniquename>
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 25 January 2003
-* @todo - add client side validation stuff
-* @todo - add column type 3 -> select field stuff
-* @package lib.visualpatterns
-*/
-
+ * $Id$
+ *
+ * Will take a query that generates a table like
+ * result and create and editable HTML table from it that can
+ * be used as part of a form.  
+ *
+ * 1 columns is REQUIRED in the Sql query:
+ *		o column giving primary key of entry in table (primary key column name specified in $aPrimaryKey)
+ *
+ * 3 hidden fields are generated for each editable entry:
+ *	o <uniquename>_id:		holds the primary key of the entry in the table (-1 = no entry in table i.e. create not update)
+ *	o <uniquename>_tn: 		holds the tablename for which the primary key is valid
+ *	o <uniquename>_type:	holds the type of entry (text/boolean/list) - for parsing purposes
+ *
+ * The actual value is held in a form field name <uniquename>
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ * @todo - add client side validation stuff
+ * @todo - add column type 3 -> select field stuff 
+ */
 class PatternEditableTableSqlQuery {
 	
 	/** query to execute*/
diff --git a/lib/visualpatterns/PatternImage.inc b/lib/visualpatterns/PatternImage.inc
index 262a437..de7f8b1 100644
--- a/lib/visualpatterns/PatternImage.inc
+++ b/lib/visualpatterns/PatternImage.inc
@@ -1,15 +1,29 @@
 <?php
-
-/*
- * 
- * Given an image URL, this class will render it inside a single cell table
+/**
+ * $Id$
+ *
+ * Given an image URL, this class will render it inside a single cell table.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
- * @date 7 January 2003
  * @package lib.visualpatterns
-
-*/
-
+ */
 class PatternImage {
 	
 	/** Image URL */
diff --git a/lib/visualpatterns/PatternListBox.inc b/lib/visualpatterns/PatternListBox.inc
index e0dd8d9..c74bca8 100644
--- a/lib/visualpatterns/PatternListBox.inc
+++ b/lib/visualpatterns/PatternListBox.inc
@@ -1,21 +1,34 @@
 <?php
 /**
-* 
-* Class PatternListBox
-*
-* Creates a drop down list box using a table name and
-* two column names (one column is the display value, the other
-* is the option value).  The option value column should always
-* be an ID that is a primary key in a table.
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 16 January 2003
-* @todo - if the list is set to submit on change, it submits the form.  Investigate ways
-* to get a list action to occur, instead of the default form action
-* @package lib.visualpatterns
-*
-*/
-
+ * $Id$
+ *
+ * Creates a drop down list box using a table name and
+ * two column names (one column is the display value, the other
+ * is the option value).  The option value column should always
+ * be an ID that is a primary key in a table
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ * @todo - if the list is set to submit on change, it submits the form.  Investigate ways
+ * to get a list action to occur, instead of the default form action 
+ */
 class PatternListBox {
 		
 	/** Database table to get information from */
diff --git a/lib/visualpatterns/PatternListFromQuery.inc b/lib/visualpatterns/PatternListFromQuery.inc
index 40e2df4..43188f6 100644
--- a/lib/visualpatterns/PatternListFromQuery.inc
+++ b/lib/visualpatterns/PatternListFromQuery.inc
@@ -1,16 +1,31 @@
 <?php
 /**
-* Class PatternListFromQuery
-* Takes a SQL query, an array of column names and and an array of column types
-* and displays the data in a two column list format
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 22 January 2003
-* @package lib.visualpatterns
-*
-* @todo implement HyperLinkURL option
-*/
-
+ * $Id$
+ *
+ * Takes a SQL query, an array of column names and and an array of column types
+ * and displays the data in a two column list format.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ * @todo implement HyperLinkURL option 
+ */
 class PatternListFromQuery {
 	
 	/** SQL query to execute */
diff --git a/lib/visualpatterns/PatternMainPage.inc b/lib/visualpatterns/PatternMainPage.inc
index afc8db7..bc846a8 100644
--- a/lib/visualpatterns/PatternMainPage.inc
+++ b/lib/visualpatterns/PatternMainPage.inc
@@ -1,21 +1,31 @@
 <?php
-
 /**
  * $Id$
- * 
+ *
  * Main page of the document management system.  Consists of a 2 x 2 HTML table.
  * Custom defined payloads can be placed in each of the table cells, giving a reasonable
  * amount of layout/design flexibility
  *
- * JavaScript to validate numbers and strings is included by default
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
  * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
- * @date 12 December 2002
  * @package lib.visualpatterns
- */	
-
+ */
 class PatternMainPage {
 	
 	/** property holder for $oNorthWestPayload */
diff --git a/lib/visualpatterns/PatternMetaData.inc b/lib/visualpatterns/PatternMetaData.inc
index ed604da..c3f9397 100644
--- a/lib/visualpatterns/PatternMetaData.inc
+++ b/lib/visualpatterns/PatternMetaData.inc
@@ -1,7 +1,31 @@
 <?php
 
 require_once("PatternListBox.inc");
-
+/**
+ * $Id$
+ *
+ * Renders document field appropriately (as a listbox if required).
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ */
 class PatternMetaData {
 	
 	var $sMetaDataField;
@@ -20,7 +44,7 @@ class PatternMetaData {
 	
 	function render() {
 		global $default;
-		$sQuery = "SELECT has_lookup FROM $default->owl_fields_table WHERE name LIKE '" . $this->sMetaDataField . "'";
+		$sQuery = "SELECT has_lookup FROM $default->document_fields_table WHERE name LIKE '" . $this->sMetaDataField . "'";
 
 		$sql = $default->db;
 		$sql->query($sQuery);
@@ -28,8 +52,8 @@ class PatternMetaData {
 			if ($sql->f("has_lookup")) {
 				//is a lookup, so display a drop down list
 				$sWhereClause = "DF.name LIKE '" . $this->sMetaDataField . "'";
-				$sFromClause = "INNER JOIN $default->owl_fields_table AS DF ON ST.document_field_id = DF.id";
-				$oPatternListBox = & new PatternListBox("$default->owl_document_fields_lookup_tables", "name", "name", $this->sFormName);
+				$sFromClause = "INNER JOIN $default->document_fields_table AS DF ON ST.document_field_id = DF.id";
+				$oPatternListBox = & new PatternListBox("$default->document_fields_lookup_tables", "name", "name", $this->sFormName);
 				if ($this->sValue != null) {
 					$oPatternListBox->setSelectedValue($this->sValue);
 				}
diff --git a/lib/visualpatterns/PatternTableLinks.inc b/lib/visualpatterns/PatternTableLinks.inc
index c994083..d16de36 100644
--- a/lib/visualpatterns/PatternTableLinks.inc
+++ b/lib/visualpatterns/PatternTableLinks.inc
@@ -1,18 +1,32 @@
 <?php
-/*
-* 
-*
-* Given an array of URLs, this class will render them as an
-* HTML table with with specified number of rows and columns
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 7 January 2003
-* @package lib.visualpatterns
-*/
-
 define("TEXT", 1);
 define("IMAGE", 2);
-
+/**
+ * $Id$
+ *
+ * Given an array of URLs, this class will render them as an
+ * HTML table with with specified number of rows and columns
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ */
 class PatternTableLinks {
 	
 	/** Array of link URLS to display in tables */
diff --git a/lib/visualpatterns/PatternTableSqlQuery.inc b/lib/visualpatterns/PatternTableSqlQuery.inc
index e4bf65c..b3921dc 100644
--- a/lib/visualpatterns/PatternTableSqlQuery.inc
+++ b/lib/visualpatterns/PatternTableSqlQuery.inc
@@ -1,28 +1,41 @@
 <?php
-
 /**
-* Class PatternTableSqlQuery
-*
-* Renders query results in a table.
-*
-* The first column in the table can be rendered as a link 
-* to the document/folder using the $iLinkType variable to specify the link type,
-* the $sLinkPageURL to specify the page URL to link to and $sLinkImageURL to specify
-* the image to display in the case of either a $iLinkType of 2 (image only) or 3 (image + text)
-*
-* If you wish to include images, there are two ways to do this
-*		o set the image url - this means that all rows will use the same image
-*		o set $bUseImageURLFromQuery to true - this will look for a column entitled image_url in
-*		  the sql result set, allowing you to specify different images for each entry
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 7 January 2003
-*
-* @todo $iLinkImageURL is hard coded - change
-* @todo $sLinkPageURL is hard coded - change
-* @package lib.visualpatterns
-*/
-
+ * $Id$
+ *
+ * Renders query results in a table.
+ *
+ * The first column in the table can be rendered as a link 
+ * to the document/folder using the $iLinkType variable to specify the link type,
+ * the $sLinkPageURL to specify the page URL to link to and $sLinkImageURL to specify
+ * the image to display in the case of either a $iLinkType of 2 (image only) or 3 (image + text)
+ *
+ * If you wish to include images, there are two ways to do this
+ *		o set the image url - this means that all rows will use the same image
+ *		o set $bUseImageURLFromQuery to true - this will look for a column entitled image_url in
+ *		  the sql result set, allowing you to specify different images for each entry
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.visualpatterns
+ * @todo $iLinkImageURL is hard coded - change
+ * @todo $sLinkPageURL is hard coded - change 
+ */
 class PatternTableSqlQuery {	
 	
 	/** query to execute*/
diff --git a/lib/web/WebDocument.inc b/lib/web/WebDocument.inc
index d74d1d4..7c3cea0 100644
--- a/lib/web/WebDocument.inc
+++ b/lib/web/WebDocument.inc
@@ -3,18 +3,31 @@
 DEFINE("PENDING",1);
 DEFINE("PUBLISHED", 2);
 DEFINE("NOT_PUBLISHED",3);
-
 /**
-* 
-* Class Web Documents
-*
-* Represents a web document as per the web_documents table in the database
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 19 January 2003
-* @package lib.web
-*/
-
+ * $Id$
+ *
+ * Represents a web document as per the web_documents table in the database.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.web
+ */
 class WebDocument {
 	
 	/** primary key of web document */
@@ -94,7 +107,7 @@ class WebDocument {
 		//if the object hasn't been created
 		if ($this->iId < 0) {
 			$sql = $default->db;
-			$result = $sql->query("INSERT INTO " . $default->owl_web_documents_table . " (document_id, web_site_id, unit_id, status_id, datetime) VALUES ($this->iDocumentID, $this->iWebSiteID, $this->iUnitID, $this->iStatusID, '$this->dDateTime')");
+			$result = $sql->query("INSERT INTO " . $default->web_documents_table . " (document_id, web_site_id, unit_id, status_id, datetime) VALUES ($this->iDocumentID, $this->iWebSiteID, $this->iUnitID, $this->iStatusID, '$this->dDateTime')");
 			if ($result) {
 				$this->iId = $sql->insert_id();
 				return  true;
@@ -117,7 +130,7 @@ class WebDocument {
 		//only update if the object has been stored
 		if ($this->iId > 0) {
 			$sql = $default->db;
-			$result = $sql->query("UPDATE " . $default->owl_web_documents_table . " SET document_id = $this->iDocumentID, web_site_id = $this->iWebSiteID, unit_id = $this->iUnitID, status_id = $this->iStatusID, datetime = '$this->dDateTime' WHERE id = $this->iId");
+			$result = $sql->query("UPDATE " . $default->web_documents_table . " SET document_id = $this->iDocumentID, web_site_id = $this->iWebSiteID, unit_id = $this->iUnitID, status_id = $this->iStatusID, datetime = '$this->dDateTime' WHERE id = $this->iId");
 			if ($result) {
 				return true;
 			}
@@ -139,7 +152,7 @@ class WebDocument {
 		//only delete the object if it exists in the database
 		if ($this->iId >= 0) {
 			$sql = $default->db;
-			$result = $sql->query("DELETE FROM $default->owl_web_documents_table WHERE id = $this->iId");
+			$result = $sql->query("DELETE FROM $default->web_documents_table WHERE id = $this->iId");
 			if ($result) {
 				return true;
 			}
@@ -161,14 +174,14 @@ class WebDocument {
 	function & get($iWebDocumentsID) {
 		global $default;
 		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM $default->owl_web_documents_table WHERE id = $iWebDocumentsID");
+		$result = $sql->query("SELECT * FROM $default->web_documents_table WHERE id = $iWebDocumentsID");
 		if ($result) {
 			if ($sql->next_record()) {
 				$oWebDocument = & new WebDocument($sql->f("document_id"), $sql->f("web_site_id"), $sql->f("unit_id"), $sql->f("status_id"), $sql->f("datetime"));
 				$oWebDocument->iId = $iWebDocumentsID;
 				return $oWebDocument;
 			}
-			$_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iWebDocumentsID . " table = $default->owl_web_documents_table";
+			$_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iWebDocumentsID . " table = $default->web_documents_table";
 			return false;
 		}
 		$_SESSION["errorMessage"] = $lang_err_database;
@@ -188,7 +201,7 @@ class WebDocument {
 		$aWebDocumentArray;
 		settype($aWebDocumentArray, "array");
 		$sql = $default->db;
-		$result = $sql->query("SELECT * FROM " . $default->owl_web_documents_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));
+		$result = $sql->query("SELECT * FROM " . $default->web_documents_table  . (isset($sWhereClause) ? " WHERE " . $sWhereClause : ""));
 		if ($result) {			
 			while ($sql->next_record()) {
 				$aWebDocumentArray[]= & WebDocument::get($sql->f("id"));
diff --git a/lib/web/WebSite.inc b/lib/web/WebSite.inc
index a8223d7..95449c5 100644
--- a/lib/web/WebSite.inc
+++ b/lib/web/WebSite.inc
@@ -1,17 +1,30 @@
 <?php
-
 /**
-*
-* Class WebSite
-* Represents a web site as per the web_sites database table
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 20 January 2003
-*
-* @todo - add regex parsing to ensure URL is valid
-* @package lib.web 
-*/
-
+ * $Id$
+ *
+ * Represents a web site as per the web_sites database table.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @package lib.web
+ * @todo - add regex parsing to ensure URL is valid
+ */
 class WebSite {
 
     /** primary key of web site */
@@ -122,7 +135,7 @@ class WebSite {
         if ($this->iId < 0) {
             //check to see if name exsits
             $sql = $default->db;
-            $query = "SELECT web_site_name FROM ". $default->owl_web_sites_table ." WHERE web_site_name = '" . $this->sWebSiteName . "' and web_site_url = '" . $this->sWebSiteURL . "' and web_master_id = '" . $this->iWebMasterID . "'";
+            $query = "SELECT web_site_name FROM ". $default->web_sites_table ." WHERE web_site_name = '" . $this->sWebSiteName . "' and web_site_url = '" . $this->sWebSiteURL . "' and web_master_id = '" . $this->iWebMasterID . "'";
             $sql->query($query);
             $rows = $sql->num_rows($sql);
             if ($rows > 0) {
@@ -133,7 +146,7 @@ class WebSite {
             } else {
 
                 $sql = $default->db;
-                $result = $sql->query("INSERT INTO " . $default->owl_web_sites_table . " (web_site_name, web_site_url, web_master_id) VALUES ('" . addslashes($this->sWebSiteName) . "', '" . addslashes($this->sWebSiteURL) . "', $this->iWebMasterID)");
+                $result = $sql->query("INSERT INTO " . $default->web_sites_table . " (web_site_name, web_site_url, web_master_id) VALUES ('" . addslashes($this->sWebSiteName) . "', '" . addslashes($this->sWebSiteURL) . "', $this->iWebMasterID)");
                 if ($result) {
                     $this->iId = $sql->insert_id();
                     return  true;
@@ -142,7 +155,7 @@ class WebSite {
                 return false;
             }
         }
-        $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->owl_web_sites_table";
+        $_SESSION["errorMessage"] = $lang_err_object_exists . "id = " . $this->iId . " table = $default->web_sites_table";
         return false;
     }
 
@@ -157,7 +170,7 @@ class WebSite {
         //only update if the object has been stored
         if ($this->iId > 0) {
             $sql = $default->db;
-            $result = $sql->query("UPDATE " . $default->owl_web_sites_table . " SET web_site_name = '" . addslashes($this->sWebSiteName) . "', web_site_url = '" . addslashes($this->sWebSiteURL) . "', web_master_id = '" . $this->iWebMasterID . "' WHERE id = $this->iId");
+            $result = $sql->query("UPDATE " . $default->web_sites_table . " SET web_site_name = '" . addslashes($this->sWebSiteName) . "', web_site_url = '" . addslashes($this->sWebSiteURL) . "', web_master_id = '" . $this->iWebMasterID . "' WHERE id = $this->iId");
             if ($result) {
                 return true;
             }
@@ -179,7 +192,7 @@ class WebSite {
         //only delete the object if it exists in the database
         if ($this->iId >= 0) {
             $sql = $default->db;
-            $result = $sql->query("DELETE FROM $default->owl_web_sites_table WHERE id = $this->iId");
+            $result = $sql->query("DELETE FROM $default->web_sites_table WHERE id = $this->iId");
             if ($result) {
                 return true;
             }
@@ -201,14 +214,14 @@ class WebSite {
     function & get($iWebSiteID) {
         global $default;
         $sql = $default->db;
-        $result = $sql->query("SELECT * FROM $default->owl_web_sites_table WHERE id = $iWebSiteID");
+        $result = $sql->query("SELECT * FROM $default->web_sites_table WHERE id = $iWebSiteID");
         if ($result) {
             if ($sql->next_record()) {
                 $oWebSite = & new WebSite(stripslashes($sql->f("web_site_name")), stripslashes($sql->f("web_site_url")), $sql->f("web_master_id"));
                 $oWebSite->iId = $iWebSiteID;
                 return $oWebSite;
             }
-            $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iWebSiteID . " table = $default->owl_web_sites_table";
+            $_SESSION["errorMessage"] = $lang_err_object_not_exist . "id = " . $iWebSiteID . " table = $default->web_sites_table";
             return false;
         }
         $_SESSION["errorMessage"] = $lang_err_database;
@@ -226,7 +239,7 @@ class WebSite {
         $aWebSiteArray;
         settype($aWebSiteArray, "array");
         $sql = $default->db;
-        $result = $sql->query("SELECT * FROM " . $default->owl_web_sites_table);
+        $result = $sql->query("SELECT * FROM " . $default->web_sites_table);
         if ($result) {
             $iCount = 0;
             while ($sql->next_record()) {