diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js
index 94b89a5e27..ca07c26f14 100644
--- a/js/codemirror/mode/mysql/mysql.js
+++ b/js/codemirror/mode/mysql/mysql.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) {
     // start of string?
     if (ch == '"' || ch == "'" || ch == '`')
       return chain(stream, state, tokenString(ch));
-    // is it one of the special signs []{}().,;? Seperator?
+    // is it one of the special signs []{}().,;? separator?
     else if (/[\[\]{}\(\),;\.]/.test(ch))
       return ret(ch, "separator");
     // start of a number value?
diff --git a/js/import.js b/js/import.js
index ec5fc9b5da..04f5217a4d 100644
--- a/js/import.js
+++ b/js/import.js
@@ -38,7 +38,6 @@ function matchFile(fname)
         }
         // Only toggle if the format of the file can be imported
         if($("select[name='format'] option").filterByValue(fname_array[len - 1]).length == 1) {
-            $("#plugins option:selected").removeProp("selected");
             $("select[name='format'] option").filterByValue(fname_array[len - 1]).prop('selected', true);
             changePluginOpts();
         }
@@ -65,7 +64,7 @@ $(document).ready(function() {
      * When the "Browse the server" form is clicked or the "Select from the web server upload directory"
      * form is clicked, the radio button beside it becomes selected and the other form becomes disabled.
      */
-    $("#input_import_file").focus(function() {
+    $("#input_import_file").bind("focus change", function() {
          $("#radio_import_file").prop('checked', true);
          $("#radio_local_import_file").removeProp('checked');
     });
diff --git a/js/jquery/timepicker.js b/js/jquery/timepicker.js
index 41e3ea005d..8425ab5b91 100644
--- a/js/jquery/timepicker.js
+++ b/js/jquery/timepicker.js
@@ -209,7 +209,7 @@ $.extend(Timepicker.prototype, {
 			// the time should come after x number of characters and a space.
 			// x = at least the length of text specified by the date format
 			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
-			// escape special regex characters in the seperator
+			// escape special regex characters in the separator
 			var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
 			regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator.replace(specials, "\\$&") + regstr;
 		}
diff --git a/js/messages.php b/js/messages.php
index bc10c3fd53..16a3d51e17 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -69,9 +69,9 @@ $js_messages['strTotal'] = __('Total');
 /* l10n: Other, small valued, queries */
 $js_messages['strOther'] = __('Other');
 /* l10n: Thousands separator */
-$js_messages['strThousandsSeperator'] = __(',');
+$js_messages['strThousandsSeparator'] = __(',');
 /* l10n: Decimal separator */
-$js_messages['strDecimalSeperator'] = __('.');
+$js_messages['strDecimalSeparator'] = __('.');
 
 $js_messages['strChartKBSent'] = __('KiB sent since last refresh');
 $js_messages['strChartKBReceived'] = __('KiB received since last refresh');
diff --git a/js/server_status.js b/js/server_status.js
index 893fb34d0d..31a9471d81 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -25,8 +25,8 @@ $(function() {
         },
         format: function(s) {
             var num = jQuery.tablesorter.formatFloat(
-                s.replace(PMA_messages['strThousandsSeperator'], '')
-                 .replace(PMA_messages['strDecimalSeperator'], '.')
+                s.replace(PMA_messages['strThousandsSeparator'], '')
+                 .replace(PMA_messages['strDecimalSeparator'], '.')
             );
 
             var factor = 1;
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 5a3ed9d02f..21787b34c1 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1587,7 +1587,7 @@ function PMA_formatNumber(
     $value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh;
     $unit = $units[$d];
 
-    // If we dont want any zeros after the comma just add the thousand seperator
+    // If we dont want any zeros after the comma just add the thousand separator
     if ($noTrailingZero) {
         $value = PMA_localizeNumber(
             preg_replace('/(?<=\d)(?=(\d{3})+(?!\d))/', ',', $value)
@@ -3515,7 +3515,7 @@ function PMA_createGISData($gis_string)
  *                          that are applicable to the provided geometry type.
  * @param bool   $binary    if set to false functions that take two geometries
  *                          as arguments will not be included.
- * @param bool   $display   if set to true seperators will be added to the
+ * @param bool   $display   if set to true separators will be added to the
  *                          output array.
  *
  * @return array names and details of the functions that can be applied on
@@ -3576,7 +3576,7 @@ function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false
 
     // If we are asked for binary functions as well
     if ($binary) {
-        // section seperator
+        // section separator
         if ($display) {
             $funcs[] = array('display' => '--------');
         }
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 733f676dbf..080239f651 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -67,9 +67,9 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
                                 now.getHours(), now.getMinutes(), now.getSeconds()) 
                                 + now.getMilliseconds() - 1000;
                             var statustext = 
-                                formatBytes(complete, 1, PMA_messages.strDecimalSeperator)
+                                formatBytes(complete, 1, PMA_messages.strDecimalSeparator)
                                 + ' <?php echo PMA_jsFormat(__('of'), false); ?> ' 
-                                + formatBytes(total, 1, PMA_messages.strDecimalSeperator);
+                                + formatBytes(total, 1, PMA_messages.strDecimalSeparator);
 
                             if ($('#importmain').is(':visible')) {
                                 // show progress UI
@@ -79,10 +79,13 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
                                     .show();
                                 import_start = now;
                             }
-                            else if (percent > 9) {
+                            else if (percent > 9 || complete > 2000000) {
                                 // calculate estimated time
                                 var used_time = now - import_start;
                                 var seconds = parseInt(((total - complete) / complete) * used_time / 1000);
+                                var speed = '<?php echo PMA_jsFormat(__('%s/sec.'), false); ?>'
+                                    .replace('%s', formatBytes(complete / used_time * 1000, 1, PMA_messages.strDecimalSeparator));
+
                                 var minutes = parseInt(seconds / 60);
                                 seconds %= 60;
                                 var estimated_time;
@@ -95,7 +98,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
                                         .replace('%SEC', seconds);
                                 }
 
-                                statustext += '<br /><br />' + estimated_time;
+                                statustext += '<br />' + speed + '<br /><br />' + estimated_time;
                             }
 
                             var percent_str = Math.round(percent) + '%';
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index b208bac702..92bb31f97a 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -823,12 +823,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      */
     function PMA_SQP_typeCheck($toCheck, $whatWeWant)
     {
-        $typeSeperator = '_';
+        $typeSeparator = '_';
         if (strcmp($whatWeWant, $toCheck) == 0) {
             return true;
         } else {
-            if (strpos($whatWeWant, $typeSeperator) === false) {
-                return strncmp($whatWeWant, $toCheck, strpos($toCheck, $typeSeperator)) == 0;
+            if (strpos($whatWeWant, $typeSeparator) === false) {
+                return strncmp($whatWeWant, $toCheck, strpos($toCheck, $typeSeparator)) == 0;
             } else {
                 return false;
             }
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 78541cd78a..80d5599deb 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -271,7 +271,7 @@ function PMA_get_arg_separator($encode = 'none')
     static $separator = null;
 
     if (null === $separator) {
-        // use seperators defined by php, but prefer ';'
+        // use separators defined by php, but prefer ';'
         // as recommended by W3C
         $php_arg_separator_input = ini_get('arg_separator.input');
         if (strpos($php_arg_separator_input, ';') !== false) {