diff --git a/app/views/layouts/flash.thtml b/app/views/layouts/flash.thtml
index 98b0957f1..f32a024cb 100644
--- a/app/views/layouts/flash.thtml
+++ b/app/views/layouts/flash.thtml
@@ -3,7 +3,9 @@
 <head>
 <title><?=$page_title?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<?php if(DEBUG == 0) { ?>
 <meta http-equiv="Refresh" content="<?=$time?>;url=<?=$url?>" />
+<?php } ?>
 <style><!--
 P { text-align:center; font:bold 1.1em sans-serif }
 A { color:#444; text-decoration:none }
diff --git a/libs/folder.php b/libs/folder.php
index b35969e2b..bf5315ef7 100644
--- a/libs/folder.php
+++ b/libs/folder.php
@@ -137,6 +137,8 @@ class Folder extends Object {
             sort($dirs);
             sort($files);
          }
+         
+         closedir($dir);
 
          return array($dirs,$files);
       }
diff --git a/libs/helpers/ajax.php b/libs/helpers/ajax.php
index 2f1fdaef9..c097fb74e 100644
--- a/libs/helpers/ajax.php
+++ b/libs/helpers/ajax.php
@@ -3,7 +3,7 @@
 
 /**
  * Short description for file.
- * 
+ *
  * Long description for file
  *
  * PHP versions 4 and 5
@@ -18,7 +18,7 @@
  *  Licensed under The MIT License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource 
+ * @filesource
  * @author       CakePHP Authors/Developers
  * @copyright    Copyright (c) 2005, CakePHP Authors/Developers
  * @link         https://trac.cakephp.org/wiki/Authors Authors/Developers
@@ -34,7 +34,7 @@
 
 /**
  * AjaxHelper helper library.
- * 
+ *
  * Long description for class
  *
  * @package    cake
@@ -49,416 +49,423 @@ uses('helpers/html', 'helpers/javascript');
 class AjaxHelper extends Helper
 {
 
-/**
-  * Returns link to remote action
-  * 
-  * Returns a link to a remote action defined by <i>options[url]</i>
-  * (using the urlFor format) that's called in the background using
-  * XMLHttpRequest. The result of that request can then be inserted into a
-  * DOM object whose id can be specified with <i>options[update]</i>.
-  * Usually, the result would be a partial prepared by the controller with
-  * either renderPartial or renderPartialCollection.
-  *
-  * Examples:
-  * <code>
-  *  linkToRemote("Delete this post", 
-  *  		array("update" => "posts", "url" => "delete/{$postid->id}"));
-  *  linkToRemote(imageTag("refresh"), 
-  *		array("update" => "emails", "url" => "list_emails" ));
-  * </code>
-  *
-  * By default, these remote requests are processed asynchronous during
-  * which various callbacks can be triggered (for progress indicators and
-  * the likes).
-  *
-  * Example:
-  * <code>
-  *   linkToRemote (word,
-  *       array("url" => "undo", "n" => word_counter),
-  *       array("complete" => "undoRequestCompleted(request)"));
-  * </code> 
-  *
-  * The callbacks that may be specified are:
-  *
-  * - <i>loading</i>::       Called when the remote document is being
-  *                           loaded with data by the browser.
-  * - <i>loaded</i>::        Called when the browser has finished loading
-  *                           the remote document.
-  * - <i>interactive</i>::   Called when the user can interact with the
-  *                           remote document, even though it has not
-  *                           finished loading.
-  * - <i>complete</i>::      Called when the XMLHttpRequest is complete.
-  *
-  * If you for some reason or another need synchronous processing (that'll
-  * block the browser while the request is happening), you can specify
-  * <i>options[type] = synchronous</i>.
-  *
-  * You can customize further browser side call logic by passing
-  * in Javascript code snippets via some optional parameters. In
-  * their order of use these are:
-  *
-  * - <i>confirm</i>::      Adds confirmation dialog.
-  * -<i>condition</i>::    Perform remote request conditionally
-  *                          by this expression. Use this to
-  *                          describe browser-side conditions when
-  *                          request should not be initiated.
-  * - <i>before</i>::       Called before request is initiated.
-  * - <i>after</i>::        Called immediately after request was
-  *  		             initiated and before <i>loading</i>.
-  *
-	* @param HtmlHelper $html The HtmlHelper object which is creating link.
-  * @param string $title title of link
-  * @param array $options options for javascript function
-  * @param array $html_options options for link
-  * @return string html code for link to remote action
-  */
-	function linkToRemote ($html, $title, $options = null, $html_options = null) {
-		return $html->link($title, $this->remoteFunction($html, $options), $html_options);
-	}
+    /**
+      * Returns link to remote action
+      *
+      * Returns a link to a remote action defined by <i>options[url]</i>
+      * (using the urlFor format) that's called in the background using
+      * XMLHttpRequest. The result of that request can then be inserted into a
+      * DOM object whose id can be specified with <i>options[update]</i>.
+      * Usually, the result would be a partial prepared by the controller with
+      * either renderPartial or renderPartialCollection.
+      *
+      * Examples:
+      * <code>
+      *  linkToRemote("Delete this post",
+      *  		array("update" => "posts", "url" => "delete/{$postid->id}"));
+      *  linkToRemote(imageTag("refresh"),
+      *		array("update" => "emails", "url" => "list_emails" ));
+      * </code>
+      *
+      * By default, these remote requests are processed asynchronous during
+      * which various callbacks can be triggered (for progress indicators and
+      * the likes).
+      *
+      * Example:
+      * <code>
+      *   linkToRemote (word,
+      *       array("url" => "undo", "n" => word_counter),
+      *       array("complete" => "undoRequestCompleted(request)"));
+      * </code>
+      *
+      * The callbacks that may be specified are:
+      *
+      * - <i>loading</i>::       Called when the remote document is being
+      *                           loaded with data by the browser.
+      * - <i>loaded</i>::        Called when the browser has finished loading
+      *                           the remote document.
+      * - <i>interactive</i>::   Called when the user can interact with the
+      *                           remote document, even though it has not
+      *                           finished loading.
+      * - <i>complete</i>::      Called when the XMLHttpRequest is complete.
+      *
+      * If you for some reason or another need synchronous processing (that'll
+      * block the browser while the request is happening), you can specify
+      * <i>options[type] = synchronous</i>.
+      *
+      * You can customize further browser side call logic by passing
+      * in Javascript code snippets via some optional parameters. In
+      * their order of use these are:
+      *
+      * - <i>confirm</i>::      Adds confirmation dialog.
+      * -<i>condition</i>::    Perform remote request conditionally
+      *                          by this expression. Use this to
+      *                          describe browser-side conditions when
+      *                          request should not be initiated.
+      * - <i>before</i>::       Called before request is initiated.
+      * - <i>after</i>::        Called immediately after request was
+      *  		             initiated and before <i>loading</i>.
+      *
+      * @param HtmlHelper $html The HtmlHelper object which is creating link.
+      * @param string $title title of link
+      * @param array $options options for javascript function
+      * @param array $html_options options for link
+      * @return string html code for link to remote action
+      */
+    function linkToRemote ($html, $title, $options = null, $html_options = null) {
+        // mouse click should call our remote function
+        $html_options['onclick'] = $this->remoteFunction($html, $options);
+        
+        // generate actual link
+        return $html->link($title, '#', $html_options);
+    }
 
-/**
-  * Creates javascript function for remote AJAX call
-  * 
-  * This function creates the javascript needed to make a remote call
-  * it is primarily used as a helper for linkToRemote.
-  * 
-  * @see linkToRemote() for docs on options parameter.
-  *
-  * @param array $options options for javascript 
-  * @return string html code for link to remote action
-  */
-	function remoteFunction ($html, $options = null) {
-		$javascript_options = $this->__optionsForAjax($options);
-		$func = isset($options['update']) ? "new Ajax.Updater('{$options['update']}', " : "new Ajax.Request(";
+    /**
+      * Creates javascript function for remote AJAX call
+      *
+      * This function creates the javascript needed to make a remote call
+      * it is primarily used as a helper for linkToRemote.
+      *
+      * @see linkToRemote() for docs on options parameter.
+      *
+      * @param array $options options for javascript
+      * @return string html code for link to remote action
+      */
+    function remoteFunction ($html, $options = null) {
+            $javascript_options = $this->__optionsForAjax($options);
+            $func = isset($options['update']) ? "new Ajax.Updater('{$options['update']}', " : "new Ajax.Request(";
 
-		$func .= "'" . $html->url(isset($options['url']) ? $options['url'] : "") . "'";
-		$func .= ", $javascript_options)";
+            $func .= "'" . $html->url(isset($options['url']) ? $options['url'] : "") . "'";
+            $func .= ", $javascript_options)";
 
-		if (isset($options['before'])) {
-			$func .= "{$options['before']}; $function";
-		}
-		if (isset($options['after'])) {
-			$func .= "$func; {$options['before']};";
-		}
-		if (isset($options['condition'])) {
-			$func .= "if ({$options['condition']}) { $func; }";
-		}
-		if (isset($options['confirm'])) {
-			$func .= "if (confirm('" . $this->escapeScript($options['confirm']) . "')) { $func; }";
-		}
-		return $func;
-	}
+            if (isset($options['before'])) {
+                    $func .= "{$options['before']}; $function";
+            }
+            if (isset($options['after'])) {
+                    $func .= "$func; {$options['before']};";
+            }
+            if (isset($options['condition'])) {
+                    $func .= "if ({$options['condition']}) { $func; }";
+            }
+            if (isset($options['confirm'])) {
+                    $func .= "if (confirm('" . $this->escapeScript($options['confirm']) . "')) { $func; }";
+            }
+            return $func;
+    }
 
-/**
-  * Periodically call remote url via AJAX. 
-  *
-  * Periodically calls the specified url (<i>options[url]</i>) every <i>options[frequency]</i> seconds (default is 10).
-  * Usually used to update a specified div (<i>options[update]</i>) with the results of the remote call.
-  * The options for specifying the target with url and defining callbacks is the same as linkToRemote.
-  *
-  * @param JavascriptHelper $script script helper generating the block
-  * @param array $options callback options
-  * @return string javascript code
-  */
-	function remoteTimer ($script, $options = null)
-	{
-		$frequency = (isset($options['frequency']))? $options['frequency'] : 10;
-		$code = "new PeriodicalExecuter(function() {" . $this->remote_function($options) . "}, $frequency)";
-		return $script->codeBlock($code);
-	}
+    /**
+      * Periodically call remote url via AJAX.
+      *
+      * Periodically calls the specified url (<i>options[url]</i>) every <i>options[frequency]</i> seconds (default is 10).
+      * Usually used to update a specified div (<i>options[update]</i>) with the results of the remote call.
+      * The options for specifying the target with url and defining callbacks is the same as linkToRemote.
+      *
+      * @param JavascriptHelper $script script helper generating the block
+      * @param array $options callback options
+      * @return string javascript code
+      */
+    function remoteTimer ($script, $options = null)
+    {
+            $frequency = (isset($options['frequency']))? $options['frequency'] : 10;
+            $code = "new PeriodicalExecuter(function() {" . $this->remote_function($options) . "}, $frequency)";
+            return $script->codeBlock($code);
+    }
 
-/**
-  * Returns form tag that will submit using Ajax.
-  * 
-  * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
-  * reloading POST arrangement. Even though it's using Javascript to serialize the form elements, the form submission
-  * will work just like a regular submission as viewed by the receiving side (all elements available in params).
-  * The options for specifying the target with :url and defining callbacks is the same as link_to_remote.
-  *
-  * @param HtmlHelper $html HtmlHelper creating this form
-  * @param JavascriptHelper $script JavascriptHelper creating this form
-  * @param string $id form id
-  * @param array $options callback options
-  * @return string javascript code
-  */
-	function form ($html, $script, $id, $options = null) {
-		$options['form'] = true;
-		$options['html']['id'] = $id;
-		//$options['html']['onsubmit'] = $this->remoteFunction($options) . "; return false;";
-		return $html->formTag(null, "post", $options) . $script->event("$('$id')", "submit", "function(){" . $this->remoteFunction($options) . "; return false;}");
-	}
-     
-/**
-  * Returns a button input tag that will submit using Ajax
-  * 
-  * Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular
-  * reloading POST arrangement. <i>options</i> argument is the same as in <i>form_remote_tag</i>
-  *
-  * @param HtmlHelper $html
-  * @param string $name input button name
-  * @param string $value input button value
-  * @param array $options callback options
-  * @return string ajaxed input button
-  */
-	function submit ($html, $name, $value, $options = null)
-	{
-		$options['with'] = 'Form.serialize(this.form)';
-		$options['html']['type'] = 'button';
-		$options['html']['onclick'] = $this->remoteFunction($html, $options) . "; return false;";
-		$options['html']['name'] = $name;
-		$options['html']['value'] = $value;
-		return $html->tag("input", $options['html'], false);
-	}
-	
-/**
-  * Observe field and call ajax on change.
-  * 
-  * Observes the field with the DOM ID specified by <i>field_id</i> and makes
-  * an Ajax when its contents have changed.
-  *
-  * Required +options+ are:
-  * - <i>frequency</i>:: The frequency (in seconds) at which changes to
-  *                       this field will be detected.
-  * - <i>url</i>::       @see urlFor() -style options for the action to call
-  *                       when the field has changed.
-  *
-  * Additional options are:
-  * - <i>update</i>::    Specifies the DOM ID of the element whose
-  *                       innerHTML should be updated with the
-  *                       XMLHttpRequest response text.
-  * - <i>with</i>::      A Javascript expression specifying the
-  *                       parameters for the XMLHttpRequest. This defaults
-  *                       to Form.Element.serialize('$field_id'), which can be
-  *                       accessed from params['form']['field_id'].
-  *
-  * Additionally, you may specify any of the options documented in
-  * @see linkToRemote().
-  *
-  * @param JavaScriptHelper $script
-  * @param string $field_id DOM ID of field to observe
-  * @param array $options ajax options
-  * @return string ajax script
-  */ 
-	function observeField ($html, $script, $field_id, $options = null) {
-		if (!isset($options['with'])) {
-			$options['with'] = "Form.Element.serialize('$field_id')";
-		}
-		return $script->codeBlock($this->__buildObserver($html, 'Form.Element.Observer', $field_id, $options));
-	}
+    /**
+      * Returns form tag that will submit using Ajax.
+      *
+      * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
+      * reloading POST arrangement. Even though it's using Javascript to serialize the form elements, the form submission
+      * will work just like a regular submission as viewed by the receiving side (all elements available in params).
+      * The options for specifying the target with :url and defining callbacks is the same as link_to_remote.
+      *
+      * @param HtmlHelper $html HtmlHelper creating this form
+      * @param JavascriptHelper $script JavascriptHelper creating this form
+      * @param string $id form id
+      * @param array $options callback options
+      * @return string javascript code
+      */
+    function form ($html, $script, $id, $options = null) {
+            $options['form'] = true;
+            $options['html']['id'] = $id;
+            //$options['html']['onsubmit'] = $this->remoteFunction($options) . "; return false;";
+            return $html->formTag(null, "post", $options) . $script->event("$('$id')", "submit", "function(){" . $this->remoteFunction($options) . "; return false;}");
+    }
 
-/**
-  * Observe entire form and call ajax on change.
-  * 
-  * Like @see observeField(), but operates on an entire form identified by the
-  * DOM ID <b>form_id</b>. <b>options</b> are the same as <b>observe_field</b>, except
-  * the default value of the <i>with</i> option evaluates to the
-  * serialized (request string) value of the form.
-  *
-  * @param JavaScriptHelper $script
-  * @param string $field_id DOM ID of field to observe
-  * @param array $options ajax options
-  * @return string ajax script
-  */
-	function observeForm ($html, $script, $field_id, $options = array()) {
-		if (!isset($options['with'])) {
-			$options['with'] = 'Form.serialize(this.form)';
-		}
-		return $script->codeBlock($this->__buildObserver($html, 'Form.Observer', $field_id, $options));
-	}
+    /**
+      * Returns a button input tag that will submit using Ajax
+      *
+      * Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular
+      * reloading POST arrangement. <i>options</i> argument is the same as in <i>form_remote_tag</i>
+      *
+      * @param HtmlHelper $html
+      * @param string $name input button name
+      * @param string $value input button value
+      * @param array $options callback options
+      * @return string ajaxed input button
+      */
+    function submit ($html, $name, $value, $options = null)
+    {
+            $options['with'] = 'Form.serialize(this.form)';
+            $options['html']['type'] = 'button';
+            $options['html']['onclick'] = $this->remoteFunction($html, $options) . "; return false;";
+            $options['html']['name'] = $name;
+            $options['html']['value'] = $value;
+            return $html->tag("input", $options['html'], false);
+    }
 
-/**
-  * Create a text field with Autocomplete.
-  *
-  * Creates an autocomplete field with the given ID and options
-  *
-  * options['with'] defaults to "Form.Element.serialize('$field_id')",
-  * but can be any valid javascript expression defining the 
-  *
-  * @param HtmlHelper $html
-  * @param JavascriptHelper $script
-  * @param string $field_id DOM ID of field to observe
-  * @param array $options ajax options
-  * @return string ajax script
-  */
-	function autoComplete ($html, $script, $field, $url = "", $options = array())
-	{
-		if (!isset($options['id'])) {
-			$options['id'] = str_replace("/", "_", $field);
-		}
+    /**
+      * Observe field and call ajax on change.
+      *
+      * Observes the field with the DOM ID specified by <i>field_id</i> and makes
+      * an Ajax when its contents have changed.
+      *
+      * Required +options+ are:
+      * - <i>frequency</i>:: The frequency (in seconds) at which changes to
+      *                       this field will be detected.
+      * - <i>url</i>::       @see urlFor() -style options for the action to call
+      *                       when the field has changed.
+      *
+      * Additional options are:
+      * - <i>update</i>::    Specifies the DOM ID of the element whose
+      *                       innerHTML should be updated with the
+      *                       XMLHttpRequest response text.
+      * - <i>with</i>::      A Javascript expression specifying the
+      *                       parameters for the XMLHttpRequest. This defaults
+      *                       to Form.Element.serialize('$field_id'), which can be
+      *                       accessed from params['form']['field_id'].
+      *
+      * Additionally, you may specify any of the options documented in
+      * @see linkToRemote().
+      *
+      * @param JavaScriptHelper $script
+      * @param string $field_id DOM ID of field to observe
+      * @param array $options ajax options
+      * @return string ajax script
+      */
+    function observeField ($html, $script, $field_id, $options = null) {
+            if (!isset($options['with'])) {
+                    $options['with'] = "Form.Element.serialize('$field_id')";
+            }
+            return $script->codeBlock($this->__buildObserver($html, 'Form.Element.Observer', $field_id, $options));
+    }
 
-		$htmlOptions = $options;
-		$ajaxOptions = array('with', 'asynchronous', 'synchronous', 'method', 'position', 'form');
-		foreach($ajaxOptions as $key) {
-			if(isset($htmlOptions[$key])) {
-				unset($htmlOptions[$key]);
-			}
-		}
-		$htmlOptions['autocomplete'] = "off";
-		
-		foreach($ajaxOptions as $key) {
-			if(isset($options[$key])) {
-				$ajaxOptions[$key] = $options[$key];
-			} else {
-				unset($ajaxOptions[$key]);
-			}
-		}
+    /**
+      * Observe entire form and call ajax on change.
+      *
+      * Like @see observeField(), but operates on an entire form identified by the
+      * DOM ID <b>form_id</b>. <b>options</b> are the same as <b>observe_field</b>, except
+      * the default value of the <i>with</i> option evaluates to the
+      * serialized (request string) value of the form.
+      *
+      * @param JavaScriptHelper $script
+      * @param string $field_id DOM ID of field to observe
+      * @param array $options ajax options
+      * @return string ajax script
+      */
+    function observeForm ($html, $script, $field_id, $options = array()) {
+            if (!isset($options['with'])) {
+                    $options['with'] = 'Form.serialize(this.form)';
+            }
+            return $script->codeBlock($this->__buildObserver($html, 'Form.Observer', $field_id, $options));
+    }
 
-		$divOptions = array('id' => $options['id'] . "_autoComplete", 'class' => "auto_complete");
-		return $html->input($field, $htmlOptions) .
-					 $html->tag("div", $divOptions, true) . "</div>" .
-					 $script->codeBlock("new Ajax.Autocompleter('" . $options['id'] . "', '" . $divOptions['id'] . "', '" . $html->url($url) . "', " . $this->__optionsForAjax($ajaxOptions) . ");");
-	}
+    /**
+      * Create a text field with Autocomplete.
+      *
+      * Creates an autocomplete field with the given ID and options
+      *
+      * options['with'] defaults to "Form.Element.serialize('$field_id')",
+      * but can be any valid javascript expression defining the
+      *
+      * @param HtmlHelper $html
+      * @param JavascriptHelper $script
+      * @param string $field_id DOM ID of field to observe
+      * @param array $options ajax options
+      * @return string ajax script
+      */
+    function autoComplete ($html, $script, $field, $url = "", $options = array())
+    {
+            if (!isset($options['id'])) {
+                    $options['id'] = str_replace("/", "_", $field);
+            }
 
-	function drag($script, $id, $options = array())
-	{
-		return $script->codeBlock("new Draggable('$id', " . $this->__optionsForDraggable($options) . ");");
-	}
+            $htmlOptions = $options;
+            $ajaxOptions = array('with', 'asynchronous', 'synchronous', 'method', 'position', 'form');
+            foreach($ajaxOptions as $key) {
+                    if(isset($htmlOptions[$key])) {
+                            unset($htmlOptions[$key]);
+                    }
+            }
+            $htmlOptions['autocomplete'] = "off";
 
-/**
-  * For a reference on the options for this function, check out
-  * http://wiki.script.aculo.us/scriptaculous/show/Droppables.add
-  *
-  */
-	function drop($html, $script, $id, $options = array())
-	{
-		return $script->codeBlock("Droppables.add('$id', " . $this->__optionsForDroppable($options) . ");");
-	}
+            foreach($ajaxOptions as $key) {
+                    if(isset($options[$key])) {
+                            $ajaxOptions[$key] = $options[$key];
+                    } else {
+                            unset($ajaxOptions[$key]);
+                    }
+            }
+
+            $divOptions = array('id' => $options['id'] . "_autoComplete", 'class' => "auto_complete");
+            return $html->input($field, $htmlOptions) .
+                                     $html->tag("div", $divOptions, true) . "</div>" .
+                                     $script->codeBlock("new Ajax.Autocompleter('" . $options['id'] . "', '" . $divOptions['id'] . "', '" . $html->url($url) . "', " . $this->__optionsForAjax($ajaxOptions) . ");");
+    }
+
+    /**
+     *
+     */
+    function drag($script, $id, $options = array())
+    {
+            return $script->codeBlock("new Draggable('$id', " . $this->__optionsForDraggable($options) . ");");
+    }
+
+    /**
+      * For a reference on the options for this function, check out
+      * http://wiki.script.aculo.us/scriptaculous/show/Droppables.add
+      *
+      */
+    function drop($html, $script, $id, $options = array())
+    {
+            return $script->codeBlock("Droppables.add('$id', " . $this->__optionsForDroppable($options) . ");");
+    }
 
 
-	function dropRemote($html, $script, $id, $options = array(), $ajaxOptions = array())
-	{
-		$options['onDrop'] = "function(element){" . $this->remoteFunction($html, $ajaxOptions) . "}";
-	}
+    function dropRemote($html, $script, $id, $options = array(), $ajaxOptions = array())
+    {
+            $options['onDrop'] = "function(element){" . $this->remoteFunction($html, $ajaxOptions) . "}";
+    }
 
-	function __optionsForDraggable ($options)
-	{
-		$opts = array("handle" => "", "revert" => "true", "constraint" => "", "change" => "");
-		foreach($opts as $key => $val) {
-			if(isset($options[$key])) {
-				$opts[$key] = $options[$key];
-			} else {
-				if($val == "") { unset($opts[$key]); }
-			}
-		}
-		if(isset($opts['handle'])) { $opts['handle'] = "'" . $opts['handle'] . "'"; }
-		if(isset($opts['constraint'])) { $opts['constraint'] = "'" . $opts['constraint'] . "'"; }
+    function __optionsForDraggable ($options)
+    {
+            $opts = array("handle" => "", "revert" => "true", "constraint" => "", "change" => "");
+            foreach($opts as $key => $val) {
+                    if(isset($options[$key])) {
+                            $opts[$key] = $options[$key];
+                    } else {
+                            if($val == "") { unset($opts[$key]); }
+                    }
+            }
+            if(isset($opts['handle'])) { $opts['handle'] = "'" . $opts['handle'] . "'"; }
+            if(isset($opts['constraint'])) { $opts['constraint'] = "'" . $opts['constraint'] . "'"; }
 
-		$out = array();
-		foreach ($opts as $k => $v)
-		{
-			$out[] = "$k:$v";
-		}
+            $out = array();
+            foreach ($opts as $k => $v)
+            {
+                    $out[] = "$k:$v";
+            }
 
-		$out = join(', ', $out);
-		$out = '{' . $out . '}';
-		return $out;
-	}
+            $out = join(', ', $out);
+            $out = '{' . $out . '}';
+            return $out;
+    }
 
 
-	function __optionsForDroppable ($options)
-	{
-		$opts = array("accept" => "", "containment" => "", "overlap" => "", "greedy" => "", "hoverclass" => "", "onHover" => "", "onDrop" => "");
-		foreach($opts as $key => $val) {
-			if(isset($options[$key])) {
-				$opts[$key] = $options[$key];
-			} else {
-				if($val == "") { unset($opts[$key]); }
-			}
-		}
-		if(isset($opts['accept'])) { $opts['accept'] = "'" . $opts['accept'] . "'"; }
-		if(isset($opts['overlap'])) { $opts['overlap'] = "'" . $opts['overlap'] . "'"; }
-		if(isset($opts['hoverclass'])) { $opts['hoverclass'] = "'" . $opts['hoverclass'] . "'"; }
+    function __optionsForDroppable ($options)
+    {
+            $opts = array("accept" => "", "containment" => "", "overlap" => "", "greedy" => "", "hoverclass" => "", "onHover" => "", "onDrop" => "");
+            foreach($opts as $key => $val) {
+                    if(isset($options[$key])) {
+                            $opts[$key] = $options[$key];
+                    } else {
+                            if($val == "") { unset($opts[$key]); }
+                    }
+            }
+            if(isset($opts['accept'])) { $opts['accept'] = "'" . $opts['accept'] . "'"; }
+            if(isset($opts['overlap'])) { $opts['overlap'] = "'" . $opts['overlap'] . "'"; }
+            if(isset($opts['hoverclass'])) { $opts['hoverclass'] = "'" . $opts['hoverclass'] . "'"; }
 
-		$out = array();
-		foreach ($opts as $k => $v)
-		{
-			$out[] = "$k:$v";
-		}
+            $out = array();
+            foreach ($opts as $k => $v)
+            {
+                    $out[] = "$k:$v";
+            }
 
-		$out = join(', ', $out);
-		$out = '{' . $out . '}';
-		return $out;
-	}
+            $out = join(', ', $out);
+            $out = '{' . $out . '}';
+            return $out;
+    }
 
-/**
-  * Javascript helper function (private).
-  *
-  */
-	function __optionsForAjax ($options)
-	{
-		$js_options = $this->__buildCallbacks($options);
-		$js_options['asynchronous'] = 'true';
-		if (isset($options['type'])) {
-			if ($options['type'] == 'synchronous') {
-				$js_options['asynchronous'] = 'false';
-			}
-		}
+    /**
+      * Javascript helper function (private).
+      *
+      */
+    function __optionsForAjax ($options)
+    {
+            $js_options = $this->__buildCallbacks($options);
+            $js_options['asynchronous'] = 'true';
+            if (isset($options['type'])) {
+                    if ($options['type'] == 'synchronous') {
+                            $js_options['asynchronous'] = 'false';
+                    }
+            }
 
-		if (isset($options['method'])) {
-			$js_options['method'] = $this->__methodOptionToString($options['method']);
-		}
+            if (isset($options['method'])) {
+                    $js_options['method'] = $this->__methodOptionToString($options['method']);
+            }
 
-		if (isset($options['position'])) {
-			$js_options['insertion'] = "Insertion." . Inflector::camelize($options['position']);
-		}
+            if (isset($options['position'])) {
+                    $js_options['insertion'] = "Insertion." . Inflector::camelize($options['position']);
+            }
 
-		if (isset($options['form'])) {
-			$js_options['parameters'] = 'Form.serialize(this)';
-		} elseif (isset($options['with'])) {
-			$js_options['parameters'] = $options['with'];
-		}
+            if (isset($options['form'])) {
+                    $js_options['parameters'] = 'Form.serialize(this)';
+            } elseif (isset($options['with'])) {
+                    $js_options['parameters'] = $options['with'];
+            }
 
-		if (isset($options['evalScripts'])) {
-			$js_options['evalScripts'] = "true";
-		} else {
-			$js_options['evalScripts'] = "false";
-		}
+            if (isset($options['evalScripts'])) {
+                    $js_options['evalScripts'] = "true";
+            } else {
+                    $js_options['evalScripts'] = "false";
+            }
 
-		$out = array();
-		foreach ($js_options as $k => $v)
-		{
-			$out[] = "$k:$v";
-		}
+            $out = array();
+            foreach ($js_options as $k => $v)
+            {
+                    $out[] = "$k:$v";
+            }
 
-		$out = join(', ', $out);
-		$out = '{' . $out . '}';
-		return $out;
-	}
+            $out = join(', ', $out);
+            $out = '{' . $out . '}';
+            return $out;
+    }
 
-	function __methodOptionToString ($method)
-	{
-		return (is_string($method) && !$method[0]=="'") ? $method : "'$method'";
-	}
+    function __methodOptionToString ($method)
+    {
+            return (is_string($method) && !$method[0]=="'") ? $method : "'$method'";
+    }
 
-	function __buildObserver ($html, $klass, $name, $options=null)
-	{
-		if(!isset($options['with']) && isset($options['update']))
-		{
-			$options['with'] = 'value';
-		}
+    function __buildObserver ($html, $klass, $name, $options=null)
+    {
+            if(!isset($options['with']) && isset($options['update']))
+            {
+                    $options['with'] = 'value';
+            }
 
-		$callback = $this->remoteFunction($html, $options);
-		$javascript = "new $klass('$name', ";
-		$javascript .= (isset($options['frequency']) ? $options['frequency'] : 2) . ", function(element, value) {";
-		$javascript .= "$callback})";
-		return $javascript;
-	}
+            $callback = $this->remoteFunction($html, $options);
+            $javascript = "new $klass('$name', ";
+            $javascript .= (isset($options['frequency']) ? $options['frequency'] : 2) . ", function(element, value) {";
+            $javascript .= "$callback})";
+            return $javascript;
+    }
 
-	function __buildCallbacks($options)
-	{
-		$actions = array('uninitialized', 'loading', 'loaded', 'interactive', 'complete');
-		$callbacks = array();
-		foreach($actions as $callback)
-		{
-			if(isset($options[$callback]))
-			{
-				$name = 'on' . ucfirst($callback);
-				$code = $options[$callback];
-				$callbacks[$name] = "function(request){".$code."}";
-			}
-		}
-		return $callbacks;
-	}
+    function __buildCallbacks($options)
+    {
+            $actions = array('uninitialized', 'loading', 'loaded', 'interactive', 'complete');
+            $callbacks = array();
+            foreach($actions as $callback)
+            {
+                    if(isset($options[$callback]))
+                    {
+                            $name = 'on' . ucfirst($callback);
+                            $code = $options[$callback];
+                            $callbacks[$name] = "function(request){".$code."}";
+                    }
+            }
+            return $callbacks;
+    }
 
 }
 
diff --git a/libs/helpers/html.php b/libs/helpers/html.php
index 656fba22a..2e67291ed 100644
--- a/libs/helpers/html.php
+++ b/libs/helpers/html.php
@@ -16,7 +16,7 @@
  *  Licensed under The MIT License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource 
+ * @filesource
  * @author       CakePHP Authors/Developers
  * @copyright    Copyright (c) 2005, CakePHP Authors/Developers
  * @link         https://trac.cakephp.org/wiki/Authors Authors/Developers
@@ -180,7 +180,7 @@ class HtmlHelper extends Helper
      * If the $url is empty, $title is used instead.
      *
      * @param  string  $title          The content of the "a" tag.
-     * @param  string  $url 
+     * @param  string  $url
      * @param  array   $htmlAttributes Array of HTML attributes.
      * @param  string  $confirmMessage Confirmation message.
      * @param  boolean $return         Wheter this method should return a value
@@ -311,7 +311,7 @@ class HtmlHelper extends Helper
         $this->setFormTag($fieldName);
         $this->tagValue($fieldName)? $htmlAttributes['checked'] = 'checked': null;
         $title = $title? $title: ucfirst($fieldName);
-        return $this->output(sprintf(TAG_CHECKBOX, $this->model, $this->field,
+        return $this->output(sprintf($this->tags['checkbox'], $this->model, $this->field,
         $this->field, $this->field,
         $this->_parseAttributes($htmlAttributes, null, '', ' '), $title), $return);
     }
@@ -347,7 +347,7 @@ class HtmlHelper extends Helper
      */
     function file($fieldName, $htmlAttributes = null, $return = false)
     {
-        return $this->output(sprintf(TAG_FILE, $fieldName,
+        return $this->output(sprintf($this->tags['file'], $fieldName,
         $this->_parseAttributes($htmlAttributes, null, '', ' ')), $return);
     }
 
@@ -398,7 +398,7 @@ class HtmlHelper extends Helper
         $this->_parseAttributes($htmlAttributes, null, '', ' ')), $return);
     }
 
-      
+
     /**
      * Returns a formatted IMG element.
      *
@@ -450,8 +450,8 @@ class HtmlHelper extends Helper
      *
      * @param  string  $fieldName      If field is to be used for CRUD, this
      *                                 should be modelName/fieldName.
-     * @param  array   $options        
-     * @param  array   $inbetween      
+     * @param  array   $options
+     * @param  array   $inbetween
      * @param  array   $htmlAttributes Array of HTML attributes.
      * @param  boolean $return         Wheter this method should return a value
      *                                 or output it. This overrides AUTO_OUTPUT.
@@ -470,7 +470,7 @@ class HtmlHelper extends Helper
             $opt_value==$value? $options_here['checked'] = 'checked': null;
             $parsed_options = $this->parseHtmlOptions(array_merge($htmlAttributes, $options_here), null, '', ' ');
             $individual_tag_name = "{$this->field}_{$opt_value}";
-            $out[] = sprintf(TAG_RADIOS, $individual_tag_name, $this->model, $this->field, $individual_tag_name, $parsed_options, $opt_title);
+            $out[] = sprintf($this->tags['radio'], $individual_tag_name, $this->model, $this->field, $individual_tag_name, $parsed_options, $opt_title);
         }
 
         $out = join($inbetween, $out);
@@ -478,32 +478,23 @@ class HtmlHelper extends Helper
     }
 
 
-
-
-
-
-
-
-
-
-
     /**
- * Returns a row of formatted and named TABLE headers.
- *
- * @param array $names
- * @param array $tr_options
- * @param array $th_options
- * @return string
- */
+    * Returns a row of formatted and named TABLE headers.
+    *
+    * @param array $names
+    * @param array $tr_options
+    * @param array $th_options
+    * @return string
+    */
     function tableHeaders($names, $tr_options=null, $th_options=null)
     {
         $out = array();
         foreach ($names as $arg)
         {
-            $out[] = sprintf(TAG_TABLE_HEADER, $this->parseHtmlOptions($th_options), $arg);
+            $out[] = sprintf($this->tags['tableHeader'], $this->parseHtmlOptions($th_options), $arg);
         }
 
-        return sprintf(TAG_TABLE_HEADERS, $this->parseHtmlOptions($tr_options), join(' ', $out));
+        return sprintf($this->tags['tableHeader'], $this->parseHtmlOptions($tr_options), join(' ', $out));
     }
 
     /**
@@ -528,11 +519,11 @@ class HtmlHelper extends Helper
             $cells_out = array();
             foreach ($line as $cell)
             {
-                $cells_out[] = sprintf(TAG_TABLE_CELL, null, $cell);
+                $cells_out[] = sprintf($this->tags['tableCell'], null, $cell);
             }
 
             $options = $this->parseHtmlOptions($count%2? $odd_tr_options: $even_tr_options);
-            $out[] = sprintf(TAG_TABLE_ROW, $options, join(' ', $cells_out));
+            $out[] = sprintf($this->tags['tableRow'], $options, join(' ', $cells_out));
         }
 
         return join("\n", $out);
@@ -604,7 +595,7 @@ class HtmlHelper extends Helper
      *
      * @param string $field  If field is to be used for CRUD, this should be modelName/fieldName
      * @param string $text
-     * @return string If there are errors this method returns an error message, else NULL. 
+     * @return string If there are errors this method returns an error message, else NULL.
      */
     function tagErrorMsg ($field, $text)
     {
@@ -830,7 +821,7 @@ class HtmlHelper extends Helper
         $this->setFormTag($tagName);
         $htmlOptions['value'] = $value? $value: $this->tagValue($tagName);
         return $this->output(sprintf($this->tags['hidden'], $this->model, $this->field, $this->parseHtmlOptions($htmlOptions, null, '', ' ')));
-    }  
+    }
     /**
      * @deprecated Name changed to 'image'. Version 0.9.2.
      * @see        HtmlHelper::image()
@@ -865,7 +856,7 @@ class HtmlHelper extends Helper
     //    $htmlAttributes['value'] = $value;
     //    return $this->input($fieldName, $htmlAttributes, $return);
     //}
-    
+
    function inputTag($tagName,  $size=20, $htmlOptions=null)
    {
       $this->setFormTag($tagName);
@@ -876,15 +867,15 @@ class HtmlHelper extends Helper
 
     /**
      * @deprecated Unified with 'link'. Version 0.9.2.
-     * @see HtmlHelper::link()     
+     * @see HtmlHelper::link()
      * @param  string  $title          The content of the "a" tag.
-     * @param  string  $url 
+     * @param  string  $url
      * @param  array   $htmlAttributes Array of HTML attributes.
      * @param  boolean $return         Wheter this method should return a value
      *                                 or output it. This overrides AUTO_OUTPUT.
      * @return mixed   Either string or boolean value, depends on AUTO_OUTPUT
      *                 and $return.
-     */ 
+     */
     function linkOut($title, $url = null, $htmlAttributes = null, $return = false)
     {
         return $this->link($title, $url, $htmlAttributes, false, $return);
@@ -892,16 +883,16 @@ class HtmlHelper extends Helper
 
     /**
      * @deprecated Unified with 'link'. Version 0.9.2.
-     * @see HtmlHelper::link()     
+     * @see HtmlHelper::link()
      * @param  string  $title          The content of the "a" tag.
-     * @param  string  $url 
+     * @param  string  $url
      * @param  array   $htmlAttributes Array of HTML attributes.
      * @param  string  $confirmMessage Confirmation message.
      * @param  boolean $return         Wheter this method should return a value
      *                                 or output it. This overrides AUTO_OUTPUT.
      * @return mixed   Either string or boolean value, depends on AUTO_OUTPUT
      *                 and $return.
-     */ 
+     */
     function linkTo($title, $url, $htmlAttributes = null, $confirmMessage = false, $return = false)
     {
         return $this->link($title, $url, $htmlAttributes, $confirmMessage, $return);
@@ -915,7 +906,7 @@ class HtmlHelper extends Helper
      * @param  string $insertBefore String to be inserted before options.
      * @param  string $insertAfter  String to be inserted ater options.
      * @return string
-     */    
+     */
     //function parseHtmlOptions($options, $exclude = null, $insertBefore = ' ', $insertAfter = null)
    // {
    //     $this->_parseAttributes($options, $exclude, $insertBefore, $insertAfter);
@@ -943,7 +934,7 @@ class HtmlHelper extends Helper
          return $options? $insert_before.$options.$insert_after: null;
       }
    }
-    
+
     /**
      * @deprecated Name changed to 'password'. Version 0.9.2.
      * @see HtmlHelper::password()
@@ -966,8 +957,8 @@ class HtmlHelper extends Helper
      * @see HtmlHelper::radio()
      * @param  string  $fieldName      If field is to be used for CRUD, this
      *                                 should be modelName/fieldName.
-     * @param  array   $options        
-     * @param  array   $inbetween      
+     * @param  array   $options
+     * @param  array   $inbetween
      * @param  array   $htmlAttributes Array of HTML attributes.
      * @param  boolean $return         Wheter this method should return a value
      *                                 or output it. This overrides AUTO_OUTPUT.
@@ -981,12 +972,12 @@ class HtmlHelper extends Helper
     }
 
     /**
-     * Returns a SELECT element, 
+     * Returns a SELECT element,
      *
      * @param string $fieldName Name attribute of the SELECT
      * @param array $option_elements Array of the OPTION elements (as 'value'=>'Text' pairs) to be used in the SELECT element
      * @param array $select_attr Array of HTML options for the opening SELECT element
-     * @param array $optionAttr Array of HTML options for the enclosed OPTION elements 
+     * @param array $optionAttr Array of HTML options for the enclosed OPTION elements
      * @return string Formatted SELECT element
      */
     function selectTag($fieldName, $option_elements, $selected=null, $select_attr=null, $optionAttr=null)
@@ -1080,7 +1071,7 @@ class HtmlHelper extends Helper
     *************************************************************************/
 
     /**
-     * Returns an HTML FORM element. 
+     * Returns an HTML FORM element.
      *
      * @param      string $target      URL for the FORM's ACTION attribute.
      * @param      string $type        FORM type (POST/GET).
@@ -1102,7 +1093,7 @@ class HtmlHelper extends Helper
      * Generates a nested unordered list tree from an array.
      *
      * @param      array   $data
-     * @param      array   $htmlAttributes 
+     * @param      array   $htmlAttributes
      * @param      string  $bodyKey
      * @param      string  $childrenKey
      * @param      boolean $return         Wheter this method should return a value
@@ -1152,7 +1143,7 @@ class HtmlHelper extends Helper
         // plaintext
         if (empty($options['encode']) || !empty($match[2]))
         {
-            return sprintf(TAG_MAILTO, $email, $this->parseHtmlOptions($options), $title);
+            return sprintf($this->tags['mailto'], $email, $this->parseHtmlOptions($options), $title);
         }
         // encoded to avoid spiders
         else
@@ -1176,13 +1167,13 @@ class HtmlHelper extends Helper
                 $title_encoded .= preg_match('/^[A-Za-z0-9]$/', $title[$ii])? '&#x' . bin2hex($title[$ii]).';': $title[$ii];
             }
 
-            return sprintf(TAG_MAILTO, $email_encoded, $this->parseHtmlOptions($options, array('encode')), $title_encoded);
+            return sprintf($this->tags['mailto'], $email_encoded, $this->parseHtmlOptions($options, array('encode')), $title_encoded);
         }
     }
 
     /**
-     * Returns a generic HTML tag (no content). 
-     * 
+     * Returns a generic HTML tag (no content).
+     *
      * Examples:
      *   + <code>tag("br") => <br /></code>
      *   + <code>tag("input", array("type" => "text")) => <input type="text" /></code>
@@ -1192,7 +1183,7 @@ class HtmlHelper extends Helper
      * @param      bool   $open Is the tag open or closed? (defaults to closed "/>")
      * @return     string The formatted HTML tag
      * @deprecated This seems useless. Version 0.9.2.
-     */   
+     */
     function tag($name, $options=null, $open=false)
     {
         $tag = "<$name ". $this->parseHtmlOptions($options);
@@ -1202,11 +1193,11 @@ class HtmlHelper extends Helper
 
     /**
      * Returns a generic HTML tag with content.
-     * 
+     *
      * Examples:
      * <code>
      * content_tag("p", "Hello world!") => <p>Hello world!</p>
-     * content_tag("div", content_tag("p", "Hello world!"), 
+     * content_tag("div", content_tag("p", "Hello world!"),
      * array("class" => "strong")) => <div class="strong"><p>Hello world!</p></div>
      * </code>
      *
@@ -1215,12 +1206,12 @@ class HtmlHelper extends Helper
      * @param  bool   $open    Is the tag open or closed? (defaults to closed "/>")
      * @return string The formatted HTML tag
      * @deprecated This seems useless. Version 0.9.2.
-     */   
+     */
     function contentTag($name, $content, $options=null)
     {
         return "<$name ". $this->parseHtmlOptions($options). ">$content</$name>";
     }
-    
+
     function dayOptionTag( $tagName, $value=null, $selected=null, $optionAttr=null)
     {
        $value = isset($value)? $value : $this->tagValue($tagName);
@@ -1280,7 +1271,7 @@ class HtmlHelper extends Helper
        return $option;
     }
 
-    function hourOptionTag( $tagName,$value=null, 
+    function hourOptionTag( $tagName,$value=null,
     $format24Hours = false,
     $selected=null,
     $optionAttr=null )
@@ -1339,7 +1330,7 @@ class HtmlHelper extends Helper
        $optionAttr);
        return $option;
     }
-    
+
     function dateTimeOptionTag( $tagName, $dateFormat = 'DMY', $timeFormat = '12',$selected=null, $optionAttr=null)
     {
        switch ( $dateFormat )
diff --git a/libs/object.php b/libs/object.php
index 9ad1c60b0..d33f8d0eb 100644
--- a/libs/object.php
+++ b/libs/object.php
@@ -3,7 +3,7 @@
 
 /**
  * Short description for file.
- * 
+ *
  * Long description for file
  *
  * PHP versions 4 and 5
@@ -18,7 +18,7 @@
  *  Licensed under The MIT License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource 
+ * @filesource
  * @author       CakePHP Authors/Developers
  * @copyright    Copyright (c) 2005, CakePHP Authors/Developers
  * @link         https://trac.cakephp.org/wiki/Authors Authors/Developers
@@ -54,6 +54,13 @@ class Object
  */
    var $db = null;
 
+/**
+ * Log object
+ *
+ * @var object
+ */
+   var $_log = null;
+
 /**
  * A hack to support __construct() on PHP 4
  * Hint: descendant classes have no PHP4 class_name() constructors,
@@ -73,14 +80,14 @@ class Object
 /**
  * Class constructor, overridden in descendant classes.
  */
-   function __construct() 
+   function __construct()
    {
    }
 
 /**
  * Class destructor, overridden in descendant classes.
  */
-   function __destruct() 
+   function __destruct()
    {
    }
 
@@ -103,7 +110,7 @@ class Object
  */
    function log ($msg, $type=LOG_ERROR)
    {
-      if (!$this->_log)
+      if (is_null($this->_log))
       {
          $this->_log = new Log ();
       }
diff --git a/libs/view.php b/libs/view.php
index ea45434c2..7ef25ea33 100644
--- a/libs/view.php
+++ b/libs/view.php
@@ -187,9 +187,9 @@ class View extends Object
    }
 
 /**
- * Enter description here...
+ * Returns a view instance (singleton)
  *
- * @return unknown
+ * @return object
  */
    function getInstance()
    {
@@ -201,24 +201,6 @@ class View extends Object
       return $instance[0];
    }
 
-/**
- * Displays a flash message. A flash message is feedback to the user that displays after editing actions, among other things.
- *
- * @param string $message Text to display to the user
- * @param string $url URL fragment
- * @param int $time Display time, in seconds
- */
-   function flash($message, $url, $time=1)
-   {
-      $this->autoRender = false;
-      $this->autoLayout = false;
-
-      $this->set('url', $this->base.$url);
-      $this->set('message', $message);
-      $this->set('time', $time);
-
-      $this->render(null,false,VIEWS.'layouts'.DS.'flash.thtml');
-   }
 
 /**
  * Render view for given action and layout. If $file is given, that is used 
diff --git a/public/index.php b/public/index.php
index 87094c743..3069ccfb7 100644
--- a/public/index.php
+++ b/public/index.php
@@ -37,8 +37,6 @@
  */
 $url = empty($_GET['url'])? null: $_GET['url'];
 
-session_start();
-
 /**
  * Get Cake's root directory
  */
@@ -82,6 +80,8 @@ $TIME_START = getMicrotime();
 
 uses('folder', 'dispatcher', 'dbo_factory');
 
+session_start();
+
 config('database');
 
 if (class_exists('DATABASE_CONFIG'))
