Index: trunk/wb/admin/interface/success.html
===================================================================
--- trunk/wb/admin/interface/success.html	(revision 113)
+++ trunk/wb/admin/interface/success.html	(revision 114)
@@ -4,7 +4,7 @@
 	{MESSAGE}
 	
 	<script language="javascript" type="text/javascript">
-		setTimeout("location.href='{REDIRECT}'", 1000);
+		setTimeout("location.href='{REDIRECT}'", 0);
 	</script>
 	
 	<noscript>
Index: trunk/wb/admin/modules/uninstall.php
===================================================================
--- trunk/wb/admin/modules/uninstall.php	(revision 113)
+++ trunk/wb/admin/modules/uninstall.php	(revision 114)
@@ -54,6 +54,9 @@
 	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
 }
 
+$database->query("DELETE FROM ".TABLE_PREFIX."modules WHERE directory =
+'$file'"); 
+
 // Run the modules uninstall script if there is one
 if(file_exists(WB_PATH.'/modules/'.$file.'/uninstall.php')) {
 	require(WB_PATH.'/modules/'.$file.'/uninstall.php');
Index: trunk/wb/admin/modules/install.php
===================================================================
--- trunk/wb/admin/modules/install.php	(revision 113)
+++ trunk/wb/admin/modules/install.php	(revision 114)
@@ -123,10 +123,10 @@
 
 // Print success message
 if ($action=="install") {
-	$admin->print_success($MESSAGE['GENERIC']['INSTALLED']);
 	$settings_rows=	"INSERT INTO `".TABLE_PREFIX."modules` VALUES "
-	." ('', '".$module_name."', '".$module_type."', '".$module_directory."');";
+	." ('', '$module_name', '$module_type', '$module_directory' );";
 	$database->query($settings_rows);
+	$admin->print_success($MESSAGE['GENERIC']['INSTALLED']);
 } else if ($action=="upgrade") {
 	$admin->print_success($MESSAGE['GENERIC']['UPGRADED']);
 }	
Index: trunk/wb/modules/htmlarea/install.php
===================================================================
--- trunk/wb/modules/htmlarea/install.php	(revision 113)
+++ trunk/wb/modules/htmlarea/install.php	(revision 114)
@@ -8,7 +8,7 @@
 	// Setup the PclZip object
 	$editor_archive = new PclZip($editor_file);
 
-	// Unzip FCKeditor to the module dir
+	// Unzip to module dir
 	$list = $editor_archive->extract(PCLZIP_OPT_PATH, $module_dir);
 	if(!$list) {
 		$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNZIP']);