diff --git a/Game/sound/applause.ogg b/Game/sound/applause.ogg
new file mode 100644
index 0000000..39ba789
Binary files /dev/null and b/Game/sound/applause.ogg differ
diff --git a/source/AUTH b/source/AUTH
index 2b2032a..1ba9aa1 100644
--- a/source/AUTH
+++ b/source/AUTH
@@ -142,6 +142,7 @@ cameraclick.ogg			openarean-svn887:/sound/misc/w_pkup.wav
 typing.ogg			openarena-svn887:/sound/world/clack.wav
 counter.ogg			openarena-svn900:/sound/feedback/hitlo.wav
 counterFinal.ogg		openarena-svn900:/sound/feedback/hit.wav
+applause.ogg			(CC-BY 3.0) Blender Foundation - Cut by LeeZH (http://opengameart.org/content/applause)
 
 /music/
 bgMusic.ogg			Trackballs team (http://trackballs.sourceforge.net/) v 1.2 (GPL2), copy of tb_design.ogg
diff --git a/source/code/ReadKeyboard.cpp b/source/code/ReadKeyboard.cpp
index 1ff83b1..54e0643 100644
--- a/source/code/ReadKeyboard.cpp
+++ b/source/code/ReadKeyboard.cpp
@@ -46,7 +46,7 @@ ReadKeyboard::ReadKeyboard(char *oldName)
 	maxLength = 16;
 	position = 0;
 	strcpy(textstring,"                              ");
-	strcpy(textstring,oldName);
+	strncpy(textstring,oldName,strlen(oldName));
 	char charecter = textstring[maxLength+1];
 	int i = maxLength+1;
 	while ((charecter == ' ') && (i>0))
diff --git a/source/code/main.cpp b/source/code/main.cpp
index bc8a475..a5330ba 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -3431,6 +3431,7 @@ int main(int argc, char *argv[])
 	}
 
 #if NETWORK
+	Config::getInstance()->setDefault("portv4","42200");
 	strcpy(serverAddress, "192.168.0.2                 \0");
 	if(configSettings->exists("address0"))
 	{
diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp
index 0c2e1d3..ce0cb05 100644
--- a/source/code/menudef.cpp
+++ b/source/code/menudef.cpp
@@ -170,6 +170,32 @@ void buttonActionPlayer2Name(Button *b)
 		return; //must save if true
 }
 
+void buttonActionPortChange(Button *b)
+{
+	char port[30];
+	snprintf(port,sizeof(port),"%i",Config::getInstance()->getInt("portv4") );
+	if (OpenDialogbox(200,100,port) && atoi(port)) 
+	{
+		Config::getInstance()->setInt("portv4",atoi(port));
+		format f(_("Port: %1%") );
+		f % port;
+		b->setLabel(f.str());
+	}
+}
+
+void buttonActionIpChange(Button *b)
+{
+	char ip[30];
+	snprintf(ip,sizeof(ip),"%s",Config::getInstance()->getString("address0").c_str() );
+	if (OpenDialogbox(200,100,ip)) 
+	{
+		Config::getInstance()->setString("address0",ip);
+		format f(_("Address: %1%") );
+		f % ip;
+		b->setLabel(f.str());
+	}
+}
+
 void buttonActionHighscores(Button *b)
 {
 	OpenScoresDisplay();
@@ -277,6 +303,19 @@ void SinglePlayerVsMenu(Button *b)
 void NetworkMenu(Button *b) 
 {
 	Menu nm(&screen,_("Network"),true);
+	Button bPort, bIp, bHost, bJoin;
+	format fi(_("Address: %1%") );
+	fi % Config::getInstance()->getString("address0");
+	bIp.setLabel(fi.str());
+	bIp.setAction(buttonActionIpChange);
+	format fp(_("Port: %1%") );
+	fp % Config::getInstance()->getString("portv4");
+	bPort.setLabel(fp.str());
+	bPort.setAction(buttonActionPortChange);
+	nm.addButton(&bIp);
+	nm.addButton(&bPort);
+	nm.run();
+	
 }
 
 void MultiplayerMenu(Button *b)