diff --git a/clusterssh/ChangeLog b/clusterssh/ChangeLog
index c9e82a8..d4222d5 100644
--- a/clusterssh/ChangeLog
+++ b/clusterssh/ChangeLog
@@ -22,6 +22,7 @@
 * Allow for configurable max number of hosts within hosts menu before
   starting a new column - see .csshrc doc for "max_host_menu_items".
   This is until Tk allows for scrollable menus
+* Amend default key_addhost from 'Control-plus' to 'Control-Shift-plus'
 
 2009-03-26 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.25-1
 
diff --git a/clusterssh/src/cssh.pl b/clusterssh/src/cssh.pl
index d58fd38..647cffe 100755
--- a/clusterssh/src/cssh.pl
+++ b/clusterssh/src/cssh.pl
@@ -950,9 +950,9 @@ sub split_hostname {
 
                # split out port from end of connect string
                # could have an invalid IPv6 address here, but the connect
-               # method will warn # it cannot connect anyhow
+               # method will warn if it cannot connect anyhow
                # However, this also catchs IPv4 addresses, possibly with ports
-                ( $server, $port ) = $connect_string =~ m/(.*)(?::(\d+))?$/;
+                ( $server, $port ) = $connect_string =~ m/^([\w.-]+)(?::(\d+))?$/xsm;
             }
         }
     }
@@ -2316,16 +2316,17 @@ Quit the program and close all connections and windows
 
 =item Control-+
 
-Open the 'Add Host(s) or Cluster(s)' dialogue box.  Mutiple host or cluster names 
-can be entered, separated by spaces.
+Open the 'Add Host(s) or Cluster(s)' dialogue box.  Mutiple host or cluster 
+names can be entered, separated by spaces.
 
 =item Alt-n
 
-Paste in the correct client name to all clients, i.e.
+Paste in the specific connection server name to each client, minus any 
+username or port, i.e.
 
 C<< scp /etc/hosts server:files/<Alt-n>.hosts >>
 
-would replace the <Alt-n> with the client's name in all the client windows
+would replace the <Alt-n> with the client's name in each window
 
 =item Alt-r