diff --git a/filemanager/inc/html.inc.php b/filemanager/inc/html.inc.php
index 737236c3e5..fb976fac85 100755
--- a/filemanager/inc/html.inc.php
+++ b/filemanager/inc/html.inc.php
@@ -73,7 +73,7 @@ function html_form_select_end ($return = 0)
 function html_form_option ($value = NULL, $displayed = NULL, $selected = NULL, $return = 0)
 {
 	if ($value != NULL && $value)
-		$value = "value=$value";
+		$value = "value=\"$value\"";
 	if ($selected != NULL && $selected)
 		$selected = "selected";
 	$rstring = "<option $value $selected>$displayed</option>";
diff --git a/filemanager/inc/main.inc.php b/filemanager/inc/main.inc.php
index 6f65e5429b..784494e0f6 100755
--- a/filemanager/inc/main.inc.php
+++ b/filemanager/inc/main.inc.php
@@ -240,6 +240,9 @@ $help_info = array
 		array ("directory_list", "The Directory List contains a list of all directories you have (at least) read access to.  Selecting a directory and clicking one of the [go_to|Go to]/[copy_to|Copy to]/[move_to|Move to] buttons will perform the selected action on that directory.  For example, if you select \"/home/somegroup/reports\" from the Directory List, and click the \"[copy_to|Copy to]\" button, all selected files and directories will be copied to \"/home/somegroup/reports\"."),
 		array ("download", "Download the first selected file to your local computer.  You can only download one file at a time.  Directories cannot be downloaded, only files."),
 		array ("create_folder", "Creates a directory (folder == directory).  The name of the directory is specified in the text box next to the Create Folder button."),
+		array ("create_file", "Creates a file in the current directory.  The name of the file is specified in the text box next to the Create File button.  After clicking the Create File button you will be presented with the [edit|Edit] screen, where you may edit the file you just created.  If you do not with to make any changes to the file at this time, simply click the Save button and the file will be saved as an empty file."),
+		array ("command_line", "Enter a Unix-style command line here, which will be executed when the [execute|Execute] button is pressed.  If you don't know what this is, you probably should turn the option off in the Preferences."),
+		array ("execute", "Clicking the Execute button will execute the Unix-style [command_line|command line] specified in the text box above.  If you don't know what this is, you probably should turn the option off in the Preferences."),
 		array ("update", "Sync the database with the filesystem for the current directory.  This is useful if you use another interface to access the same files.  Any new files or directories in the current directory will be read in, and the attributes for the other files will be updated to reflect any changes to the filesystem.  Update is run automatically every few page loads (currently every 20 page loads as of this writing, but that may have changed by now)."),
 		array ("file_stats", "Various statistics on the number and size of the files in the current directory.  In some situations, these reflect different statistics.  For example, when in / or the base directory."),
 		array ("upload_file", "The full path of the local file to upload.  You can type it in or use the Browse.. button to select it.  The file will be uploaded to the current directory.  You cannot upload directories, only files."),
diff --git a/filemanager/index.php b/filemanager/index.php
index d3a1a8344b..84302d7a9a 100755
--- a/filemanager/index.php
+++ b/filemanager/index.php
@@ -83,7 +83,7 @@ include ("../header.inc.php");
 
 if ($execute && $command_line)
 {
-	if ($result = $phpgw->vfs->command_line ($command_line))
+	if ($result = $phpgw->vfs->command_line (stripslashes ($command_line)))
 	{
 		$messages = html_text_bold ("Command sucessfully run", 1);
 		if ($result != 1 && strlen ($result) > 0)
@@ -503,7 +503,9 @@ if (!$op && !$delete && !$createdir && !$renamefiles && !$move && !$copy && !$ed
 		while (list ($num, $name) = each ($settings))
 		{
 			if ($name)
+			{
 				$columns++;
+			}
 		}
 		$columns++;
 		html_table_begin ();
@@ -525,12 +527,18 @@ if (!$op && !$delete && !$createdir && !$renamefiles && !$move && !$copy && !$ed
 		if ($cwd)
 		{
 			if ($path == $homedir)
+			{
 				html_image ("images/folder-home.gif", "Folder", "center");
+			}
 			else
+			{
 				html_image ("images/folder.gif", "Folder", "center");
+			}
 		}
 		else
+		{
 			html_image ("images/folder-home.gif", "Home");
+		}
 		
 		html_font_set (4, HTML_TABLE_FILES_HEADER_TEXT_COLOR);
                 html_text_bold (strtoupper ($disppath));
@@ -625,9 +633,13 @@ if (!$op && !$delete && !$createdir && !$renamefiles && !$move && !$copy && !$ed
         			}
 
 				if ($rename && $this_selected)
+				{
 					$renamethis = 1;
+				}
 				elseif ($edit_comments && $this_selected)
+				{
 					$edit_this_comment = 1;
+				}
 			}
 
 			if (!$settings["dotfiles"] && ereg ("^\.", $files["name"]))
@@ -669,7 +681,9 @@ if (!$op && !$delete && !$createdir && !$renamefiles && !$move && !$copy && !$ed
 				if ($renamethis)
 				{
 					if ($files["mime_type"] == "Directory")
+					{
 						html_image ("images/folder.gif", "Folder");
+					}
 					html_form_input ("text", "renamefiles[" . base64_encode ($files[name]) . "]", $files["name"], 255);
 				}
 				else
@@ -745,7 +759,9 @@ if (!$op && !$delete && !$createdir && !$renamefiles && !$move && !$copy && !$ed
 			{
 				html_table_col_begin ();
 				if ($files["modified"] != "0000-00-00")
+				{
 					html_text ($files["modified"]);
+				}
 				html_table_col_end ();
 			}
 
@@ -1009,6 +1025,7 @@ if (!$op && !$delete && !$createdir && !$renamefiles && !$move && !$copy && !$ed
 			html_nbsp (3);
 			html_form_input ("text", "createfile", NULL, 255, 15);
 			html_form_input ("submit", "newfile", "Create File");
+			html_help_link ("create_file");
 		}
 
 		if ($settings["show_command_line"])