diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
index 75d7e79fd..1ee093aed 100644
--- a/builtin/mainmenu/tab_local.lua
+++ b/builtin/mainmenu/tab_local.lua
@@ -106,6 +106,7 @@ local function main_button_handler(this, fields, name, tabdata)
 	if fields["play"] ~= nil or world_doubleclick or fields["key_enter"] then
 		local selected = core.get_textlist_index("sp_worlds")
 		gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
+		core.settings:set_bool("auto_connect", false)
 
 		if core.settings:get_bool("enable_server") then
 			if selected ~= nil and gamedata.selected_world ~= 0 then
@@ -114,7 +115,6 @@ local function main_button_handler(this, fields, name, tabdata)
 				gamedata.port           = fields["te_serverport"]
 				gamedata.address        = ""
 
-				core.settings:set_bool("auto_connect", false)
 				core.settings:set("port",gamedata.port)
 				if fields["te_serveraddr"] ~= nil then
 					core.settings:set("bind_address",fields["te_serveraddr"])
diff --git a/games/default/files/damage_noise/init.lua b/games/default/files/damage_noise/init.lua
deleted file mode 100644
index 954544eff..000000000
--- a/games/default/files/damage_noise/init.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-
-damage = {}
-
-minetest.register_on_joinplayer(function(player)
-	damage[player:get_player_name()] = player:get_hp()
-end)
-
-minetest.register_globalstep(function(dtime)
-	for _,player in ipairs(minetest.get_connected_players()) do
-		local newhp = player:get_hp()
-		local oldhp = damage[player:get_player_name()]
-		
-		if oldhp > newhp then
-			local pos = player:get_pos()
-			minetest.sound_play("hurt", {
-				pos = pos,
-				max_hear_distance = 10,
-				gain = 0.4,
-			})
-		end
-		damage[player:get_player_name()] = newhp
-	end
-end)
diff --git a/games/default/files/damage_noise/license.txt b/games/default/files/damage_noise/license.txt
deleted file mode 100644
index 1db3ff4ec..000000000
--- a/games/default/files/damage_noise/license.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
-Sounds:
-http://www.freesound.org/people/thecheeseman/sounds/44428/
-http://www.freesound.org/people/thecheeseman/sounds/44429/
-http://www.freesound.org/people/thecheeseman/sounds/44430/
\ No newline at end of file
diff --git a/games/default/files/default/README.txt b/games/default/files/default/README.txt
index a6c1b49f8..2dfa9c476 100644
--- a/games/default/files/default/README.txt
+++ b/games/default/files/default/README.txt
@@ -62,3 +62,10 @@ Mito551 (sounds) (CC BY-SA):
   default_dirt_footstep.1.ogg
   default_dirt_footstep.2.ogg
   default_glass_footstep.ogg
+
+  player_damage.1.ogg
+  player_damage.2.ogg
+  player_damage.3.ogg
+  http://www.freesound.org/people/thecheeseman/sounds/44428/
+  http://www.freesound.org/people/thecheeseman/sounds/44429/
+  http://www.freesound.org/people/thecheeseman/sounds/44430/
\ No newline at end of file
diff --git a/games/default/files/default/chests.lua b/games/default/files/default/chests.lua
index 7ef024c75..c21bee128 100644
--- a/games/default/files/default/chests.lua
+++ b/games/default/files/default/chests.lua
@@ -129,7 +129,6 @@ minetest.register_node("default:chest", {
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
 		if fields.exit then
-		  print('test')
 		  fields.quit = true
 	  --	minetest.show_formspec(sender:get_player_name(), 'quit', "")
 		end
diff --git a/games/default/files/damage_noise/sounds/hurt.1.ogg b/games/default/files/default/sounds/player_damage.1.ogg
similarity index 100%
rename from games/default/files/damage_noise/sounds/hurt.1.ogg
rename to games/default/files/default/sounds/player_damage.1.ogg
diff --git a/games/default/files/damage_noise/sounds/hurt.2.ogg b/games/default/files/default/sounds/player_damage.2.ogg
similarity index 100%
rename from games/default/files/damage_noise/sounds/hurt.2.ogg
rename to games/default/files/default/sounds/player_damage.2.ogg
diff --git a/games/default/files/damage_noise/sounds/hurt.3.ogg b/games/default/files/default/sounds/player_damage.3.ogg
similarity index 100%
rename from games/default/files/damage_noise/sounds/hurt.3.ogg
rename to games/default/files/default/sounds/player_damage.3.ogg