diff --git a/fp-includes/core/core.system.php b/fp-includes/core/core.system.php
index 1791dbc..b2ed87a 100755
--- a/fp-includes/core/core.system.php
+++ b/fp-includes/core/core.system.php
@@ -73,7 +73,7 @@
 
 
 	
-	define('SYSTEM_VER', '0.804');
+	define('SYSTEM_VER', '0.805');
 	function system_ver() {
 		return 'fp-' . SYSTEM_VER;
 	}
diff --git a/fp-interface/lang/en-us/lang.admin.widgets.php b/fp-interface/lang/en-us/lang.admin.widgets.php
index 127adf0..68993e7 100644
--- a/fp-interface/lang/en-us/lang.admin.widgets.php
+++ b/fp-interface/lang/en-us/lang.admin.widgets.php
@@ -8,15 +8,21 @@
 	$lang['admin']['widgets']['default'] = array(
 		'head'		=> 'Manage Widgets (<em>experimental</em>)',
 		
-		'descr'		=> 'A <a class="hint" '.
-						'href="http://wiki.flatpress.org/doc:plugins" title="What is a Widget?">'.
-						'Widget</a> is a visual element of a <a class="hint" '.
-						'href="http://wiki.flatpress.org/doc:plugins" title="What is a Plugin?">'.
-						'Plugin</a> that you can put in some special areas '.
-						'(the <em>widgetsets</em>) on your blog pages '.
-						'called <strong>widgetsets</strong> </p>'.
-						'<p><strong>Drag</strong> a widget from the right box and <strong>drop</strong> '.
-						'it to the position you prefer.</p>',
+		'descr'		=> 	'A <a class="hint" '.
+						'href="http://wiki.flatpress.org/doc:widgets" title="What is a Widget?">'.
+						'Widget</a> is a dynamic component that can display data and interact with the user.
+						While <strong>Themes</strong> are meant to change how your blog looks like, Widgets 
+						<strong>extend</strong> looks and functionalities.</p>
+
+						<p>Widgets can be dragged to special areas of your theme called the 
+						<strong>WidgetSets</strong>. The number and the name of the  WidgetSets may vary with the 
+						theme you choose.</p>
+
+						<p>FlatPress comes with several widgets: there are widgets to help with the login, to 
+						display a search box, etc.</p>
+						
+						<p>Each Widget is defined by a <a class="hint" '.
+						'href="http://wiki.flatpress.org/doc:plugins" title="What is a Widget?">plugin</a>.',
 						
 		'availwdgs'	=> 'Available Widgets',
 		'trashcan'	=> 'Drop here to delete',
diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl
index 92f4b89..e5ef80c 100755
--- a/fp-interface/sharedtpls/contact.tpl
+++ b/fp-interface/sharedtpls/contact.tpl
@@ -14,15 +14,15 @@
 	<fieldset><legend>{$lang.contact.fieldset1}</legend>
 		<p><label class="textlabel" for="name">{$lang.contact.name}</label><br />
 		<input type="text" name="name" id="name" {$error.name|notempty:'class="field-error"'} 
-		value="{$values.name|stripslashes}" /></p>
+		value="{$values.name|stripslashes|wp_specialchars:true}" /></p>
 		
 		<p><label class="textlabel" for="email">{$lang.contact.email}</label><br />
 		<input type="text" name="email" id="email" {$error.email|notempty:'class="field-error"'} 
-		value="{$values.email|stripslashes}" /></p>
+		value="{$values.email|stripslashes|wp_specialchars:true}" /></p>
 		
 		<p><label class="textlabel" for="url">{$lang.contact.www}</label><br />
 		<input type="text" name="url" id="url" {$error.url|notempty:'class="field-error"'} 
-		value="{$values.url|stripslashes}" /></p>
+		value="{$values.url|stripslashes|wp_specialchars:true}" /></p>
 		
 		{comment_form}
 		
@@ -31,7 +31,7 @@
 	<fieldset><legend>{$lang.contact.fieldset2}</legend>
 		<p><label for="content">{$lang.contact.comment}</label><br />
 		<textarea name="content" id="content" {$error.content|notempty:'class="field-error"'} 
-		rows="10" cols="74">{$values.content|stripslashes}</textarea></p>
+		rows="10" cols="74">{$values.content|stripslashes|wp_specialchars:true}</textarea></p>
 
 	</fieldset>
 	
diff --git a/fp-interface/sharedtpls/login.tpl b/fp-interface/sharedtpls/login.tpl
index 1e2a918..fd0861e 100755
--- a/fp-interface/sharedtpls/login.tpl
+++ b/fp-interface/sharedtpls/login.tpl
@@ -3,9 +3,9 @@
 <form id="login" method="post" action="{$smarty.server.PHP_SELF}" enctype="multipart/form-data">
 	<fieldset><legend>{$lang.login.fieldset1}</legend>
 	<p><label for="user">{$lang.login.user}</label><br />
-	<input {$error.user|notempty:'class="field-error"'} type="text" name="user" id="user" {if $smarty.post.user}value="{$smarty.post.user}"{/if} /></p>
+	<input {$error.user|notempty:'class="field-error"'} type="text" name="user" id="user" {if $smarty.post.user}value="{$smarty.post.user|wp_specialchars:true}"{/if} /></p>
 	<p><label for="pass">{$lang.login.pass}</label><br />
-	<input type="password" {$error.pass|notempty:'class="field-error"'} name="pass" id="pass" {if $smarty.post.pass}value="{$smarty.post.pass}"{/if} /></p>
+	<input type="password" {$error.pass|notempty:'class="field-error"'} name="pass" id="pass" /></p>
 	</fieldset>
 	
 	<div class="buttonbar">
diff --git a/setup/lang/lang.en-us.php b/setup/lang/lang.en-us.php
index 9a90606..258419d 100644
--- a/setup/lang/lang.en-us.php
+++ b/setup/lang/lang.en-us.php
@@ -23,7 +23,7 @@ LangId: English
 		'descr' => 
 		'Thank you for choosing <strong>FlatPress</strong>!
 		
-		Before you can start having fun with your brand new blog, we have ask you a very few questions. 
+		Before you can start having fun with your brand new blog, we have to ask you a very few questions. 
 		
 		Don\'t worry, it won\'t take you long!',
 		
@@ -66,7 +66,7 @@ LangId: English
 		
 		Unbelievable? 
 		
-		And you\'re right: <strong>the story has just begun</strong>, but <strong>writing it\'s up to you</strong>!
+		And you\'re right: <strong>the story has just begun</strong>, but <strong>writing is up to you</strong>!
 		
 		<ul>
 		<li>See <a href="%s">how the home page looks like</a></li>