diff --git a/source/src/CUBE_TODO.txt b/source/src/CUBE_TODO.txt
index 6c52771a..5c1f83f8 100644
--- a/source/src/CUBE_TODO.txt
+++ b/source/src/CUBE_TODO.txt
@@ -183,7 +183,7 @@ multiplayer:
 - vote: either explain it or make it easier.. generally make a multiplayer connect walkthru
 - rethink map get? make it even easier???
 - locking of in-progress games
-- when switching to map that player doesnt have... something better should happen than keep him in old map with floating players
+- when switching to map that player doesnt have... something better should happen than keep them in old map with floating players
 - capture the chicken mode? other different DM modes? domination? holy wars?
 - teamplay scores don't record frags of disconnected players
 - teamplay binds
diff --git a/source/src/client.cpp b/source/src/client.cpp
index a9b8381f..cc7ee57f 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -286,7 +286,7 @@ COMMAND(go_to, ARG_2STR);
 void current_version(char *text)
 {
     int version = atoi(text);
-    if (version && AC_VERSION<version) conoutf("UPDATE YOUR CLIENT\ngo to %s for more information",AC_MASTER_URI);
+    if (version && AC_VERSION<version) conoutf("YOUR VERSION OF ASSAULTCUBE IS OUTDATED\!\nYOU MUST UPDATE ASSAULTCUBE\nplease visit %s for more information",AC_MASTER_URI);
 }
 COMMAND(current_version, ARG_1STR);
 
@@ -660,7 +660,7 @@ bool securemapcheck(const char *map, bool msg)
     {
         if(msg)
         {
-            conoutf(_("%c4%s%c3 is a secured map, you CAN\'T send, receive or overwrite it"), CC, map, CC);
+            conoutf(_("map %c4%s%c3 is secured, this means you CAN\'T send, receive or overwrite it"), CC, map, CC);
             if(connected)
             {
                 conoutf(_("%c3if you get this error alot you or the server may be running an outdated game"), CC);
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 3b79dfff..2f3654dc 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -187,8 +187,8 @@ void newteam(char *name)
         int nt = teamatoi(name);
         if(nt == player1->team) return; // same team
         if(!team_isvalid(nt)) { conoutf(_("%c3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)"), CC, name); return; }
-        if(team_isspect(nt) && player1->state != CS_DEAD) { conoutf(_("you need to be dead to become spectator")); return; }
-        if(player1->state == CS_EDITING) conoutf(_("you can't change team while editing"));
+        if(team_isspect(nt) && player1->state != CS_DEAD) { conoutf(_("you\'ll need to be in a \"dead\" state to become a spectator")); return; }
+        if(player1->state == CS_EDITING) conoutf(_("you can\'t change team while editing"));
         else addmsg(SV_SWITCHTEAM, "ri", nt);
     }
     else conoutf(_("your team is: %s"), team_string(player1->team));
@@ -603,7 +603,7 @@ inline const char * spawn_message()
     {
         // Don't use "/n" within these messages. If you do, the words won't align to the middle of the screen.
         if (securemapcheck(getclientmap()))
-        return "3Server will NOT allow spawning or getmap!";   // Also see client.cpp which has a conoutf message
+        return "3The server will NOT allow spawning or getmap!";   // Also see client.cpp which has a conoutf message
         else return "3You must be on the correct map to spawn. Type /getmap to download it.";
     }
     else if (m_coop) return "3Type /getmap or send a map and vote for it to start co-op edit.";
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 055543a3..72c0bc92 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1352,7 +1352,7 @@ void serverdamage(client *target, client *actor, int damage, int gun, bool gib,
         target->position.setsize(0);
         ts.state = CS_DEAD;
         ts.lastdeath = gamemillis;
-        if(!suic) logline(ACLOG_INFO, "[%s] %s %s%s %s", actor->hostname, actor->name, gib ? gib_message(gun) : "fragged", tk ? " his teammate" : "", target->name);
+        if(!suic) logline(ACLOG_INFO, "[%s] %s %s%s %s", actor->hostname, actor->name, gib ? gib_message(gun) : "fragged", tk ? " their teammate" : "", target->name);
         if(m_flags && targethasflag >= 0)
         {
             if(m_ctf)