diff --git a/compile.bat b/compile.bat
index a81560a..f5dbade 100644
--- a/compile.bat
+++ b/compile.bat
@@ -8,13 +8,13 @@
 
 @echo off
 
-SET mod_name=promodlive216
+SET mod_name=pml217
 SET work_directory=%~dp0
 cd %work_directory%
 
 del ..\%mod_name%\*.iwd
 
 7za a -r -mx=9 -mpass=15 -mfb=258 -mmt=on -mtc=off -tzip ..\%mod_name%\%mod_name%.iwd weapons images sound
-7za a -r -mx=9 -mpass=15 -mfb=258 -mmt=on -mtc=off -tzip ..\%mod_name%\z_custom_ruleset.iwd promod_ruleset
+7za a -r -mx=9 -mpass=15 -mfb=258 -mmt=on -mtc=off -tzip ..\%mod_name%\z_c_r.iwd promod_ruleset
 
 compile_fastfile.bat
diff --git a/compile_fastfile.bat b/compile_fastfile.bat
index 1d751fd..0e104de 100644
--- a/compile_fastfile.bat
+++ b/compile_fastfile.bat
@@ -25,7 +25,7 @@ copy mod.csv ..\..\zone_source /Y
 cd ..\..\bin
 linker_pc.exe -language english -compress -cleanup mod -verbose
 
-cd ..\mods\promodlive216
+cd ..\mods\pml217
 copy ..\..\zone\english\mod.ff
 
 pause
diff --git a/pb/promod_iwd_md5.cfg b/pb/promod_iwd_md5.cfg
index 23ddc90..4f741d8 100644
--- a/pb/promod_iwd_md5.cfg
+++ b/pb/promod_iwd_md5.cfg
@@ -1 +1 @@
-pb_sv_md5tool a "" v mods/promodlive216/promodlive216.iwd SZ276308 AT0 LEN2048 0B6BD48A1B9FE82904C3C4FD549B4FEA
\ No newline at end of file
+pb_sv_md5tool a "" v mods/pml217/pml217.iwd SZ276308 AT0 LEN2048 0B6BD48A1B9FE82904C3C4FD549B4FEA
\ No newline at end of file
diff --git a/promod/readyup.gsc b/promod/readyup.gsc
index 9924e9b..9c1a431 100644
--- a/promod/readyup.gsc
+++ b/promod/readyup.gsc
@@ -36,8 +36,7 @@ main()
 	setClientNameMode( "auto_change" );
 	setGameEndTime( 0 );
 
-	if ( game["promod_first_readyup_done"] )
-		thread periodAnnounce();
+	thread periodAnnounce();
 
 	level.ready_up_over = false;
 	previous_not_ready_count = 0;
@@ -292,22 +291,20 @@ clientHUD()
 	self.periodtext.foreground = false;
 	self.periodtext.hidewheninmenu = true;
 
-	if ( game["promod_first_readyup_done"] )
-	{
-		self.halftimetext = createFontString( "objective", 1.5 );
-		self.halftimetext.alpha = 0;
-		self.halftimetext setPoint( "CENTER", "CENTER", 0, 200 );
-		self.halftimetext.sort = 1001;
+	self.halftimetext = createFontString( "objective", 1.5 );
+	self.halftimetext.alpha = 0;
+	self.halftimetext setPoint( "CENTER", "CENTER", 0, 200 );
+	self.halftimetext.sort = 1001;
 
-		if ( game["promod_in_timeout"] && (!isDefined( game["LAN_MODE"] ) || !game["LAN_MODE"]) )
-			text = "Remaining";
-		else
-			text = "Elapsed";
+	self.halftimetext.foreground = false;
+	self.halftimetext.hidewheninmenu = true;
 
-		self.halftimetext setText( "Time " + text );
-		self.halftimetext.foreground = false;
-		self.halftimetext.hidewheninmenu = true;
-	}
+	if ( game["promod_first_readyup_done"] && game["promod_in_timeout"] && (!isDefined( game["LAN_MODE"] ) || !game["LAN_MODE"]) )
+		text = "Remaining";
+	else
+		text = "Elapsed";
+
+	self.halftimetext setText( "Time " + text );
 
 	self thread moveOver();
 
@@ -364,7 +361,7 @@ moveOver()
 		self.periodtext MoveOverTime( 2.5 );
 	}
 
-	self.periodtext setPoint( "CENTER", "CENTER", 0, 185 + int( !isDefined( self.halftimetext ) ) * 25 );
+	self.periodtext setPoint( "CENTER", "CENTER", 0, 185 );
 
 	if( level.rup_txt_fx )
 	{
diff --git a/promod/scorebot.gsc b/promod/scorebot.gsc
index 14e7c95..a7acd12 100644
--- a/promod/scorebot.gsc
+++ b/promod/scorebot.gsc
@@ -49,7 +49,7 @@ actionTicker()
 	setDvar( "__promod_defence_score", game["promod_scorebot_defence_ticker_buffer"], true );
 	setDvar( "__promod_mode", toLower( getDvar( "promod_mode" ) ), true );
 	setDvar( "__promod_ticker", getDvar( "__promod_ticker" ), true );
-	setDvar( "__promod_version", "Promod LIVE V2.16 EU", true );
+	setDvar( "__promod_version", "Promod LIVE V2.17 EU", true );
 
 	for(;;)
 	{
diff --git a/promod/servercheck.gsc b/promod/servercheck.gsc
index b65e862..8e99029 100644
--- a/promod/servercheck.gsc
+++ b/promod/servercheck.gsc
@@ -76,9 +76,9 @@ errorMessage()
 		if ( (antilag && dedicated == "dedicated LAN server") || (!antilag && dedicated == "dedicated internet server" && !game["PROMOD_PB_OFF"]))
 			iprintlnbold("^1Server Violation^7: Modified Connection");
 
-		if( isDefined( game["PROMOD_MATCH_MODE"] ) && game["PROMOD_MATCH_MODE"] == "match" || toLower( getDvar( "fs_game" ) ) == "mods/promodlive216" )
+		if( isDefined( game["PROMOD_MATCH_MODE"] ) && game["PROMOD_MATCH_MODE"] == "match" || toLower( getDvar( "fs_game" ) ) == "mods/pml217" )
 		{
-			if( toLower(getDvar("fs_game")) != "mods/promodlive216" )
+			if( toLower(getDvar("fs_game")) != "mods/pml217" )
 				iprintlnbold("^1Server Violation^7: Invalid fs_game value");
 
 			iwdnames = strToK( getDvar( "sv_iwdnames" ), " " );
@@ -104,12 +104,12 @@ errorMessage()
 					case "iw_13":
 						break;
 
-					case "z_custom_ruleset":
+					case "z_c_r":
 						if ( isDefined( game["PROMOD_MATCH_MODE"] ) && game["PROMOD_MATCH_MODE"] == "match" && iwdsums[i] != "1988645860" )
 							iprintlnbold("^1Server Violation^7: Modified Custom IWD File While In Match Mode");
 						break;
 
-					case "promodlive216":
+					case "pml217":
 						if( iwdsums[i] != "1491770436" )
 							iprintlnbold("^1Server Violation^7: Modified Promod IWD Detected");
 						iwd_loaded = true;
diff --git a/promod/setvariables.gsc b/promod/setvariables.gsc
index 1837fe8..ef89c20 100644
--- a/promod/setvariables.gsc
+++ b/promod/setvariables.gsc
@@ -32,5 +32,5 @@ main()
 	game["axis_timeout_called"] = 0;
 
 	game["promod_first_readyup_done"] = 0;
-	game["PROMOD_VERSION"] = "Promod ^1LIVE ^7V2.16 EU";
+	game["PROMOD_VERSION"] = "Promod ^1LIVE ^7V2.17 EU";
 }
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 66a9e3a..cebbf1e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,20 +1,19 @@
-Promod LIVE V2.16 EU - README
+Promod LIVE V2.17 EU - README
 http://www.codpromod.com
-2013-05-29 <promod [at] codpromod.com>
+2013-06-27 <promod [at] codpromod.com>
 #codpromod @ QuakeNet
 
 Developers: Trivve & Ingram
-Manager: abhi
 
 Sponsored by FragNet
 http://www.fragnet.net
 
-Zip-package (promodlive216_eu.zip) contains:
+Zip-package (promodlive217_eu.zip) contains:
 
 LICENSE
-promodlive216\mod.ff
-promodlive216\promodlive216.iwd
-promodlive216\z_custom_ruleset.iwd
+pml217\mod.ff
+pml217\pml217.iwd
+pml217\z_c_r.iwd
 pb\stock_iwd_md5.cfg
 pb\promod_iwd_md5.cfg
 pb\pbsvuser.cfg
@@ -22,6 +21,14 @@ readme.txt
 server_setup.txt
 server.cfg
 
+LIVE V2.17:
+- Shortened file and folder names in order to fix (or avoid) "file sum/name mismatch" error. Please note that fs_game naming scheme is slighly different from now on.
+- Added timer to pre-match ready up period.
+
+Leagues should allow both 2.16 and 2.17 for now as they are nearly identical. Upgrade from 2.16 is not necessary in case the server owner does not experience any problems listed above. This release does not contain any other changes and is intended as a quick fix for server owners having trouble setting up servers under Windows.
+
+Public server owners should rename their z_custom_ruleset.iwd to the new shorter version of z_c_r.iwd, nothing inside is changed.
+
 LIVE V2.16:
 - Fixed a small bug that appeared during 2.15. We're sorry about that!
 
@@ -134,7 +141,7 @@ Q: What about the hardcore, and support for all gametypes, how do I use them?
 A: For a complete list of "promod_modes", see below.
 
 Q: I want to run my own custom Promod-server with skins etc, how?
-A: In order to run your own custom Promod-server you'll need to change the fs_game to anything besides "mods/promodlive216" as well as not using match-modes. You will now be able to modify the Promod IWDs and add additional iwd-files.
+A: In order to run your own custom Promod-server you'll need to change the fs_game to anything besides "mods/pml217" as well as not using match-modes. You will now be able to modify the Promod IWDs and add additional iwd-files.
 
 Q: Can I use this mod as a movie mod?
 A: Yes, you can! Commands (which are important for movie-making) are only forced on the clients once connected. Demos needs to be loaded using devmap before starting a demo ("devmap mp_crash;disconnect").
@@ -176,7 +183,7 @@ comp_public - the default mode for competitive public
 comp_public_lan - same as above, but for LAN servers
 comp_public_hc - competitive public in hardcore mode
 comp_public_hc_lan - same as above, but for LAN servers
-custom_public - custom public mode reading settings from z_custom_ruleset.iwd
+custom_public - custom public mode reading settings from z_c_r.iwd
 custom_public_lan - same as above, but for LAN servers
 strat - strategy mode for practicing
 
@@ -328,8 +335,8 @@ For example map "mp_dahman_b3" contains a file called "mp_dahman_b3.iwd" and the
 
 NOTES FOR SERVER-ADMINS AND SERVER-HOSTING COMPANIES
 
-The dvar fs_game "mods/promodlive216" is forced for match-servers and do not rename any files or modify contents of them.
-However custom servers with skins etc. must use something else than "mods/promodlive216" for example "mods/promodlive216_custom", it's not restricted and you are free to modify files as well.
+The dvar fs_game "mods/pml217" is forced for match-servers and do not rename any files or modify contents of them.
+However custom servers with skins etc. must use something else than "mods/pml217" for example "mods/pml217_custom", it's not restricted and you are free to add additional iwd files or modify existing ones.
 
 Included with Promod are two PunkBuster MD5 configs, "stock_iwd_md5.cfg" and "promod_iwd_md5.cfg" which you can put in the pb-folder on your server, it contains checksums for the stock IWD-files as well as Promod-IWD for use with PunkBuster MD5 facility to prevent custom skins and other forms of cheating and abusing and can be loaded in-game by typing "\rcon pb_sv_load stock_iwd_md5.cfg" and "\rcon pb_sv_load promod_iwd_md5.cfg".
 
@@ -344,5 +351,5 @@ We STRONGLY encourage use of these MD5-checks! (This goes for leagues as well!)
 
 Due to several game engine exploits, we recommend to specify the rcon-password in the command-line of your server. If this is not possible, rename the server-config to something other than server.cfg, which would make finding rcon password more difficult.
 
-On another note of security, the IWD-file "z_custom_ruleset.iwd" is now running integrity checks if server is running match-mode which means you have to decide whether the server should run "promod_mode custom_public" or not.
-If you later want to run match-modes you will have to use the original unmodified "z_custom_ruleset.iwd" supplied in this package. Sorry for any inconvenience caused.
\ No newline at end of file
+On another note of security, the IWD-file "z_c_r.iwd" is now running integrity checks if server is running match-mode which means you have to decide whether the server should run "promod_mode custom_public" or not.
+If you later want to run match-modes you will have to use the original unmodified "z_c_r.iwd" supplied in this package. Sorry for any inconvenience caused.
\ No newline at end of file
diff --git a/server.cfg b/server.cfg
index 481b7cc..c98f165 100644
--- a/server.cfg
+++ b/server.cfg
@@ -1,5 +1,5 @@
 // promod live v2 - sample server config v1.4
-// for public ruleset customizations, see z_custom_ruleset.iwd
+// for public ruleset customizations, see z_c_r.iwd
 
 // info strings
 sets _Admin ""
@@ -7,7 +7,7 @@ sets _Email ""
 sets _Website ""
 sets _Location ""
 sets _Irc ""
-sets sv_hostname "Another Promod ^1LIVE ^7V2.16 ^7Server is Born"
+sets sv_hostname "Another Promod ^1LIVE ^7V2.17 ^7Server is Born"
 
 // welcome message, message of the day (motd)
 seta scr_motd "Please visit us at www.codpromod.com, also visit our IRC channel #codpromod @ QuakeNet"
diff --git a/server_setup.txt b/server_setup.txt
index 90e4bfb..636f733 100644
--- a/server_setup.txt
+++ b/server_setup.txt
@@ -4,7 +4,7 @@
 
 This is a sample command-line for starting and using Promod LIVE V2 under Windows:
 
-<path to iw3mp.exe> +set dedicated 2 +set net_ip localhost +set net_port 28960 +set sv_punkbuster 1 +set fs_game mods/promodlive216 +exec server.cfg +set rcon_password password +map_rotate
+<path to iw3mp.exe> +set dedicated 2 +set net_ip localhost +set net_port 28960 +set sv_punkbuster 1 +set fs_game mods/pml217 +exec server.cfg +set rcon_password password +map_rotate
 
 dedicated [0-2] (listen, LAN, internet)
 net_ip [xxx.xxx.xxx.xxx]
@@ -13,8 +13,8 @@ net_port [1-65535] (standard is 28960)
 Make sure you put the server config (server.cfg) in the main-folder or specify correct path to it.
 Please note that we also define the rcon password to the server here to prevent someone from downloading your config from server and thus view ("hack") your rcon password.
 
-The dvar fs_game "mods/promodlive216" is forced for match-servers and do not rename any files or modify contents of them.
-However custom servers with skins etc. must use something else than "mods/promodlive216" for example "mods/promodlive216_custom", it's not restricted and you are free to modify files as well.
+The dvar fs_game "mods/pml217" is forced for match-servers and do not rename any files or modify contents of them.
+However custom servers with skins etc. must use something else than "mods/pml217" for example "mods/pml217_custom", it's not restricted and you are free to add additional iwd files or modify existing ones.
 
 Included with Promod is two PunkBuster MD5 configs, "stock_iwd_md5.cfg" and "promod_iwd_md5.cfg" which you can put in the pb-folder on your server, it contains checksums for the stock IWD-files as well as Promod-IWD for use with PunkBuster MD5 facility to prevent custom skins and other forms of cheating and abusing and can be loaded in-game by typing "\rcon pb_sv_load stock_iwd_md5.cfg" and "\rcon pb_sv_load promod_iwd_md5.cfg".
 
diff --git a/ui_mp/main.menu b/ui_mp/main.menu
index 8605faa..13a58c5 100644
--- a/ui_mp/main.menu
+++ b/ui_mp/main.menu
@@ -141,7 +141,7 @@
 		}
 		itemDef
 		{
-			text			"Current Promod Version: LIVE V2.16 EU"
+			text			"Current Promod Version: LIVE V2.17 EU"
 			style			0
 			textscale		0.25
 			textstyle		3
@@ -170,21 +170,6 @@
 			decoration
 		}
 		itemDef
-		{
-			text			"Manager: abhi"
-			style			0
-			textscale		0.25
-			textstyle		3
-			rect			239 236 95 20
-			textalign		ITEM_ALIGN_LEFT
-			textalignx		0
-			textaligny		0
-			textfont		UI_FONT_NORMAL
-			forecolor		1 1 1 1
-			visible			when( localvarBool( ui_about ) );
-			decoration
-		}
-		itemDef
 		{
 			text			"Former developers: raf1, MavLP, bulletworm"
 			style			0