diff --git a/CounterStrike/csserver b/CounterStrike/csserver
index 86551d59d..a19887145 100644
--- a/CounterStrike/csserver
+++ b/CounterStrike/csserver
@@ -16,7 +16,8 @@ email="email@example.com"
 defaultmap="de_aztec"
 port="27015"
 clientport="27005"
-parms="-game cstrike +map ${defaultmap} -strictportbind -port ${port} +clientport ${clientport}"
+maxplayers="16"
+parms="-game cstrike +map ${defaultmap} -strictportbind -port ${port} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
@@ -570,8 +571,12 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Creating server.cfg"
+<<<<<<< HEAD
 	touch ${filesdir}/cstrike/cfg/server.cfg
 	echo "exec ${servicename}.cfg" > ${filesdir}/cstrike/cfg/server.cfg
+=======
+	echo "exec ${servicename}.cfg" >> ${filesdir}/cstrike/server.cfg
+>>>>>>> a46f23fd4b86e3ec69a9db2cb61c76f4977a8678
 	sleep 1
 	echo "Creating default config file:"
 	sleep 0.5
@@ -634,9 +639,9 @@ echo "================================="
 	sleep 1
 	echo ""
 	echo "Applying steamclient.so fix"
-	mkdir -v ${rootdir}/.steam
-	mkdir -v ${rootdir}/.steam/sdk32
-	cp -v ${filesdir}/steamclient.so ${rootdir}/.steam/sdk32/steamclient.so
+	mkdir -v ${HOME}/.steam
+	mkdir -v ${HOME}/.steam/sdk32
+	cp -v ${filesdir}/steamclient.so ${HOME}/.steam/sdk32/steamclient.so
 	sleep 1
 	fn_header
 	fn_details
diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver
index c9ecbe86c..f93ebcd02 100644
--- a/CounterStrikeGlobalOffensive/csgoserver
+++ b/CounterStrikeGlobalOffensive/csgoserver
@@ -17,7 +17,8 @@ defaultmap="de_dust"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="-game csgo +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="-game csgo +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver
index 3a67a3271..805a804c4 100644
--- a/CounterStrikeSource/cssserver
+++ b/CounterStrikeSource/cssserver
@@ -17,7 +17,8 @@ defaultmap="de_dust"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="-game cstrike +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="-game cstrike +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver
index 50529f9f8..20e8814c9 100644
--- a/DayOfDefeatSource/dodsserver
+++ b/DayOfDefeatSource/dodsserver
@@ -17,7 +17,8 @@ defaultmap="dod_Anzio"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="-game dod +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="-game dod +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver
index 09b608e73..8cef4dbbd 100644
--- a/HalfLife2Deathmatch/hl2dmserver
+++ b/HalfLife2Deathmatch/hl2dmserver
@@ -17,7 +17,8 @@ defaultmap="dm_lockdown"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="-game hl2mp +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="-game hl2mp +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server
index 66f56e6fa..fc7b2fc44 100644
--- a/Left4Dead2/l4d2server
+++ b/Left4Dead2/l4d2server
@@ -17,7 +17,8 @@ defaultmap="c5m1_waterfront"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="-game left4dead2 +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="-game left4dead2 +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver
index d38e79a63..a5f4d8097 100644
--- a/NoMoreRoomInHell/nmrihserver
+++ b/NoMoreRoomInHell/nmrihserver
@@ -21,7 +21,8 @@ defaultmap="nmo_broadway"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="+map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="+map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server
index 5f54a9531..e0f74b0ff 100644
--- a/TeamFortress2/tf2server
+++ b/TeamFortress2/tf2server
@@ -17,7 +17,8 @@ defaultmap="ctf_2fort"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="-game tf +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="-game tf +map ${defaultmap} -strictportbind -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####
 
diff --git a/TheHiddenSource/thsserver b/TheHiddenSource/thsserver
index a015a6650..d443b464a 100644
--- a/TheHiddenSource/thsserver
+++ b/TheHiddenSource/thsserver
@@ -18,7 +18,8 @@ defaultmap="hdn_docks"
 port="27015"
 sourcetvport="27020"
 clientport="27005"
-parms="-game hidden +map ${defaultmap} -port ${port} +tv_port ${sourcetvport} +clientport ${clientport}"
+maxplayers="16"
+parms="-game hidden +map ${defaultmap} -port ${port} +tv_port ${sourcetvport} +clientport ${clientport} -maxplayers ${maxplayers}"
 
 #### Advanced Variables ####