diff --git a/admin/admin.php b/admin/admin.php
index a774cf4..666b47d 100644
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/admin/ajax.php b/admin/ajax.php
index c8baa9d..3508737 100644
--- a/admin/ajax.php
+++ b/admin/ajax.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/admin/close.php b/admin/close.php
index f34f09d..0c101b1 100644
--- a/admin/close.php
+++ b/admin/close.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/admin/css/style.css b/admin/css/style.css
index e1082f4..ba180ff 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -4,7 +4,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 
diff --git a/admin/index.php b/admin/index.php
index 3ca0272..c80f958 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
@@ -24,7 +25,7 @@ $tumble = new gelato();
 $conf = new configuration();
 $template = new plantillas("admin");
 
-$isEdition = isset($_GET["edit"]);
+$isEdition = (isset($_GET["edit"])) ? true : false;
 $postId = ($isEdition) ? $_GET["edit"] : NULL;
 
 if ($user->isAdmin()) {
@@ -46,11 +47,11 @@ if ($user->isAdmin()) {
 					header("Location: ".$conf->urlGelato."/admin/index.php?photo=false");
 					die();
 				}
-				$_POST["url"] = $conf->urlGelato."/uploads/".$photoName;
+				$_POST["url"] = "../uploads/".$photoName;
 			}
 			
 			if ( move_uploaded_file( $_FILES['photo']['tmp_name'], "../uploads/".sanitizeName($_FILES['photo']['name']) ) ) {
-				$_POST["url"] = $conf->urlGelato."/uploads/".sanitizeName($_FILES['photo']['name']);
+				$_POST["url"] = "../uploads/".sanitizeName($_FILES['photo']['name']);
 			}
 			
 			unset($_POST["photo"]);
@@ -303,7 +304,7 @@ if ($user->isAdmin()) {
 								<p>
 									<span style="color: rgb(136, 136, 136); margin-bottom: 10px; font-size: 10px;"><a href="http://hobix.com/textile/">Textile</a> syntax is supported.</span>
 								</p>
-								<p>									
+								<p>
 									<input class="btn" type="submit" name="btnAdd" value="<?php echo ($isEdition) ? "Modify" : "Create"; ?> post" />
 								</p>
 						</fieldset>
diff --git a/admin/options.php b/admin/options.php
index 148d5db..5ceacf2 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/admin/settings.php b/admin/settings.php
index 01a6d49..e6aaa6a 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/admin/user.php b/admin/user.php
index 45d7f63..2bea1da 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/classes/configuration.class.php b/classes/configuration.class.php
index f0a542b..ea4ff11 100644
--- a/classes/configuration.class.php
+++ b/classes/configuration.class.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/classes/functions.php b/classes/functions.php
index 76e7103..910c174 100644
--- a/classes/functions.php
+++ b/classes/functions.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/classes/gelato.class.php b/classes/gelato.class.php
index 705e2dc..a96dc08 100644
--- a/classes/gelato.class.php
+++ b/classes/gelato.class.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/classes/imgsize.php b/classes/imgsize.php
index 19f9afa..2963914 100644
--- a/classes/imgsize.php
+++ b/classes/imgsize.php
@@ -1,5 +1,7 @@
 <?php
 header ("Content-type: image/jpeg");
+header('Cache-Control: max-age=172800, must-revalidate');
+header('Expires: ' . date('r', time()+120));
 /*
 JPEG / PNG Image Resizer
 Parameters (passed via URL):
diff --git a/classes/templates.class.php b/classes/templates.class.php
index a2a7a26..eadda3b 100644
--- a/classes/templates.class.php
+++ b/classes/templates.class.php
@@ -12,6 +12,8 @@
  */
 ?>
 <?php
+require_once("functions.php");
+
 class plantillas {
 
 	var $plantilla;
@@ -46,8 +48,8 @@ class plantillas {
 				$this->plantilla_cargada = $salida_xhtml;
 			} 
 		}
-	}
-	
+	}	
+		
 	function precargarPlantillaConBloque($entrada, $salida, $plantilla_usar) {		
 		$plantilla_usar = "themes/".$this->plantilla."/".$plantilla_usar.".htm";
 		
@@ -71,6 +73,7 @@ class plantillas {
 		}
 	}
 	
+	
 	function cargarPlantillaConBloque($entrada, $salida, $plantilla_usar, $nombreBloque) {		
 		$plantilla_usar = "themes/".$this->plantilla."/".$plantilla_usar.".htm";
 		
@@ -92,6 +95,7 @@ class plantillas {
 		}
 	}
 	
+	
 	function procesaBloque($entrada, $salida, $bloque) {
 		for ($i = 0; $i < count($entrada); $i++) {
 			$bloque = str_replace($entrada[$i], $salida[$i], $bloque);
diff --git a/classes/user.class.php b/classes/user.class.php
index f5e66c3..5066191 100644
--- a/classes/user.class.php
+++ b/classes/user.class.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/config-sample.php b/config-sample.php
index 788256c..ad50487 100644
--- a/config-sample.php
+++ b/config-sample.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/index.php b/index.php
index 1487e1c..0b45f41 100644
--- a/index.php
+++ b/index.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/install.php b/install.php
index 395f0dd..9cbb38e 100644
--- a/install.php
+++ b/install.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/login.php b/login.php
index 9c8e250..1e47656 100644
--- a/login.php
+++ b/login.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/notice.txt b/notice.txt
new file mode 100644
index 0000000..bdaf32f
--- /dev/null
+++ b/notice.txt
@@ -0,0 +1,46 @@
+== CREDITS= =
+Gelato developers and designers (in chronological order):
+
+Pedro Santana [ http://www.pecesama.net/weblog/ ]
+Jorge Condomí [ http://www.raven.com.ar/ ]
+Víctor de la Rocha [ http://blog.mis-algoritmos.com/ ]
+Victor Bracco [ http://www.vbracco.com.ar/blog/ ]
+
+= COPYRIGHT NOTICES =
+This product includes code and libraries developed by third parties, which are governed by different licenses.  These components, and their licenses, are listed below.
+
+= Mootools =
+Copyright (c) 2006 Valerio Proietti, http://mad4milk.net
+Mootools is available under MIT Style License.
+
+= Slimbox =
+Copyright (c) Christophe Beyls, http://www.digitalia.be
+Slimbox available under MIT Style License.
+
+= Sortable =
+Copyright (c) 1997-2006 Stuart Langridge, Joost de Valk, http://www.joostdevalk.nl/code/sortable-table/
+Sortable available under MIT license.
+
+= MP3 Audio Player =
+Copyright (c) 2005-2006  Martin Laine, http://www.1pixelout.net
+MP3 Audio Player available under GNU General Public License.
+
+= JPEG / PNG Image Resizer =
+Copyright (c) Michael John G. Lopez, http://www.sydel.net
+JPEG / PNG Image Resizer available under an Open License.
+
+= Clase Conexion_Mysql =
+Copyright (c) Pedro Santana, http://www.pecesama.net/weblog/
+Clase Conexion_Mysql available under MIT license.
+
+= Digg Style Paginator Class =
+Copyright (c) Victor De la Rocha, http://www.mis-algoritmos.com/
+Digg Style Paginator Class available under MIT license.
+
+= Clase plantillas =
+Copyright (c) Pedro Santana, http://www.pecesama.net/weblog/
+Clase plantillas available under MIT license.
+
+= Textile class =
+Copyright (c) Jim Riggs, http://jimandlissa.com/project/textilephp
+Textile class available under GNU General Public License.
\ No newline at end of file
diff --git a/rss.php b/rss.php
index cc2b2f2..8fce9e1 100644
--- a/rss.php
+++ b/rss.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/update.php b/update.php
index 6352510..91526e3 100644
--- a/update.php
+++ b/update.php
@@ -5,7 +5,8 @@
   development version
   http://www.gelatocms.com/
 
-  gelato CMS is a free software licensed under GPL (General public license)
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
 
   =========================== */
 ?>
diff --git a/uploads/index.php b/uploads/index.php
index 4e6c07c..7a6a280 100644
--- a/uploads/index.php
+++ b/uploads/index.php
@@ -1,3 +1,15 @@
 <?php
-// Silence is golden.
+/* ===========================
+
+  gelato CMS - A PHP based tumblelog CMS
+  development version
+  http://www.gelatocms.com/
+
+  gelato CMS is a free software licensed under the GPL 2.0
+  Copyright (C) 2007 by Pedro Santana <pecesama at gmail dot com>
+
+  =========================== */
+?>
+<?php
+// Nothing here
 ?>
\ No newline at end of file