diff --git a/src/client/hud_weaponselect.qc b/src/client/hud_weaponselect.qc
index df90a40..77fde99 100644
--- a/src/client/hud_weaponselect.qc
+++ b/src/client/hud_weaponselect.qc
@@ -169,7 +169,7 @@ HUD_SlotSelect(int slot)
 	if (pSeat->m_flHUDWeaponSelectTime < time) {
 		pl.StartSoundDef("Player.WeaponSelectionOpen", CHAN_ITEM, false);
 	} else {
-		pl.StartSoundDef("Player WeaponSelectionMoveSlot", CHAN_ITEM, false);
+		pl.StartSoundDef("Player.WeaponSelectionMoveSlot", CHAN_ITEM, false);
 	}
 
 	/* weren't in that slot? select the first one then */
@@ -212,7 +212,7 @@ HUD_DrawWeaponSelect(void)
 	}
 	if (pSeat->m_flHUDWeaponSelectTime < time) {
 		if (pSeat->m_iHUDWeaponSelected) {
-			pl.StartSoundDef("Player WeaponSelectionClose", CHAN_ITEM, false);
+			pl.StartSoundDef("Player.WeaponSelectionClose", CHAN_ITEM, false);
 			pSeat->m_iHUDWeaponSelected = 0;
 		}
 		return;
diff --git a/src/server/spawn.qc b/src/server/spawn.qc
index b982600..c0bccf6 100644
--- a/src/server/spawn.qc
+++ b/src/server/spawn.qc
@@ -13,35 +13,3 @@
  * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-void info_player_start(void)
-{
-	self.solid = SOLID_TRIGGER;
-	self.botinfo = BOTINFO_SPAWNPOINT;
-	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
-	setorigin_safe(self, self.origin);
-}
-
-void info_player_deathmatch(void)
-{
-	self.solid = SOLID_TRIGGER;
-	self.botinfo = BOTINFO_SPAWNPOINT;
-	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
-	setorigin_safe(self, self.origin);
-}
-
-void info_player_team1(void)
-{
-	self.solid = SOLID_TRIGGER;
-	self.botinfo = BOTINFO_SPAWNPOINT;
-	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
-	setorigin_safe(self, self.origin);
-}
-
-void info_player_team2(void)
-{
-	self.solid = SOLID_TRIGGER;
-	self.botinfo = BOTINFO_SPAWNPOINT;
-	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
-	setorigin_safe(self, self.origin);
-}
diff --git a/zpak001.pk3dir/sound/func_tracktrain.sndshd b/zpak001.pk3dir/sound/func_tracktrain.sndshd
index 4d0d1b4..d6d3d80 100644
--- a/zpak001.pk3dir/sound/func_tracktrain.sndshd
+++ b/zpak001.pk3dir/sound/func_tracktrain.sndshd
@@ -1,29 +1,43 @@
 func_tracktrain.move_1
 {
+	follow
+	looping
 	sample plats/ttrain1.wav
 }
 func_tracktrain.move_2
 {
+	follow
+	looping
 	sample plats/ttrain2.wav
 }
 func_tracktrain.move_3
 {
+	follow
+	looping
 	sample plats/ttrain3.wav
 }
 func_tracktrain.move_4
 {
+	follow
+	looping
 	sample plats/ttrain4.wav
 }
 func_tracktrain.move_5
 {
+	follow
+	looping
 	sample plats/ttrain5.wav
 }
 func_tracktrain.move_6
 {
+	follow
+	looping
 	sample plats/ttrain6.wav
 }
 func_tracktrain.move_7
 {
+	follow
+	looping
 	sample plats/ttrain7.wav
 }
 
diff --git a/zpak001.pk3dir/sound/func_train.sndshd b/zpak001.pk3dir/sound/func_train.sndshd
index 4d714ad..b2cdaac 100644
--- a/zpak001.pk3dir/sound/func_train.sndshd
+++ b/zpak001.pk3dir/sound/func_train.sndshd
@@ -1,57 +1,85 @@
 func_train.move_1
 {
+	follow
+	looping
 	sample common/null.wav
 }
 func_train.move_2
 {
+	follow
+	looping
 	sample plats/bigmove1.wav
 }
 func_train.move_3
 {
+	follow
+	looping
 	sample plats/bigmove2.wav
 }
 func_train.move_4
 {
+	follow
+	looping
 	sample plats/elevmove1.wav
 }
 func_train.move_5
 {
+	follow
+	looping
 	sample plats/elevmove2.wav
 }
 func_train.move_6
 {
+	follow
+	looping
 	sample plats/elevmove3.wav
 }
 func_train.move_7
 {
+	follow
+	looping
 	sample plats/freightmove1.wav
 }
 func_train.move_8
 {
+	follow
+	looping
 	sample plats/freightmove2.wav
 }
 func_train.move_9
 {
+	follow
+	looping
 	sample plats/heavymove1.wav
 }
 func_train.move_10
 {
+	follow
+	looping
 	sample plats/rackmove1.wav
 }
 func_train.move_11
 {
+	follow
+	looping
 	sample plats/railmove1.wav
 }
 func_train.move_12
 {
+	follow
+	looping
 	sample plats/squeekmove1.wav
 }
 func_train.move_13
 {
+	follow
+	looping
 	sample plats/talkmove1.wav
 }
 func_train.move_14
 {
+	follow
+	looping
 	sample plats/talkmove2.wav
 }
 
@@ -89,5 +117,6 @@ func_train.stop_8
 }
 func_train.stop_9
 {
+
 	sample plats/talkstop1.wav
 }