diff --git a/build/android/Makefile b/build/android/Makefile
index 4f7c6c05a..d7df78ce8 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -753,14 +753,14 @@ assets : $(ASSETS_TIMESTAMP)
 	if [ $$REFRESH -ne 0 ] ; then                                              \
 	echo "assets changed, refreshing...";                                      \
 	$(MAKE) clean_assets;                                                      \
-	mkdir -p ${ROOT}/assets/MultiCraft;                                          \
-	cp ${ROOT}/../../multicraft.conf.example ${ROOT}/assets/MultiCraft;            \
-	cp ${ROOT}/../../README.md ${ROOT}/assets/MultiCraft;                       \
-	cp -r ${ROOT}/../../builtin ${ROOT}/assets/MultiCraft;                       \
-	mkdir ${ROOT}/assets/MultiCraft/fonts;                                       \
-	cp -r ${ROOT}/../../fonts/*.ttf ${ROOT}/assets/MultiCraft/fonts/;            \
-	cp -r ${ROOT}/../../games ${ROOT}/assets/MultiCraft;                        \
-	cp -r ${ROOT}/../../textures ${ROOT}/assets/MultiCraft;                       \
+	mkdir -p ${ROOT}/assets/MultiCraft;                                        \
+	cp ${ROOT}/../../multicraft.conf.example ${ROOT}/assets/MultiCraft;        \
+	cp ${ROOT}/../../README.md ${ROOT}/assets/MultiCraft;                      \
+	cp -r ${ROOT}/../../builtin ${ROOT}/assets/MultiCraft;                     \
+	mkdir ${ROOT}/assets/MultiCraft/fonts;                                     \
+	cp -r ${ROOT}/../../fonts/basis33.ttf ${ROOT}/assets/MultiCraft/fonts/;    \
+	cp -r ${ROOT}/../../games ${ROOT}/assets/MultiCraft;                       \
+	cp -r ${ROOT}/../../textures ${ROOT}/assets/MultiCraft;                    \
 	cd ${ROOT}/assets ||  exit 1;                                              \
 	find . -name "timestamp" -exec rm {} \; ;                                  \
 	find . -name "*.blend" -exec rm {} \; ;                                    \
@@ -769,7 +769,7 @@ assets : $(ASSETS_TIMESTAMP)
 	find . -type d -path "*.svn" -exec rm -rf {} \; ;                          \
 	find . -type f -path "*.gitignore" -exec rm -rf {} \; ;                    \
 	ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \
-	find MultiCraft >"filelist.txt";                                             \
+	find MultiCraft >"filelist.txt";                                           \
 	cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old;            \
 	echo "Creating Files.zip";						   \
 	zip -r Files.zip MultiCraft;						   \
@@ -884,4 +884,4 @@ manifest :
 clean_manifest :
 	rm -rf ${ROOT}/AndroidManifest.xml
 
-clean : clean_apk clean_assets
\ No newline at end of file
+clean : clean_apk clean_assets
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 4881ac6ca..bf65baaa0 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -99,7 +99,7 @@ local function init_globals()
 	if PLATFORM ~= "Android" then
 		tv_main:add(tab_settings)
 		tv_main:add(tab_texturepacks)
-		tv_main:add(tab_mods)
+		--tv_main:add(tab_mods)
 	end
 	tv_main:add(tab_credits)
 
@@ -122,7 +122,7 @@ local function init_globals()
 
 	ui.update()
 
-	core.sound_play("main_menu", true)
+	core.sound_play("main_menu", false)
 
 	mm_texture.clear("header")
 	mm_texture.clear("footer")
diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua
index ec3495ea5..55eea22a9 100644
--- a/builtin/mainmenu/tab_server.lua
+++ b/builtin/mainmenu/tab_server.lua
@@ -34,9 +34,9 @@ local function get_formspec(tabview, name, tabdata)
 		"button[9.2,4.15;2.55,0.5;world_configure;" .. fgettext("Configure") .. "]" ..
 		"button[8.5,4.95;3.25,0.5;start_server;" .. fgettext("Start Game") .. "]" ..
 		"label[4,-0.25;" .. fgettext("Select World:") .. "]" ..
-		"checkbox[0.25,0.25;cb_creative_mode;" .. fgettext("Creative Mode") .. ";" ..
+		"checkbox[0.25,0.25;cb_creative_mode;" .. fgettext("Creative Inventory") .. ";" ..
 		dump(core.setting_getbool("creative_mode")) .. "]" ..
-		"checkbox[0.25,0.7;cb_enable_damage;" .. fgettext("Enable Damage") .. ";" ..
+		"checkbox[0.25,0.7;cb_enable_damage;" .. fgettext("Survival Mode") .. ";" ..
 		dump(core.setting_getbool("enable_damage")) .. "]" ..
 		"checkbox[0.25,1.15;cb_server_announce;" .. fgettext("Public") .. ";" ..
 		dump(core.setting_getbool("server_announce")) .. "]" ..
diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua
index d66ec4403..95c7c0c56 100644
--- a/builtin/mainmenu/tab_singleplayer.lua
+++ b/builtin/mainmenu/tab_singleplayer.lua
@@ -34,9 +34,9 @@ local function get_formspec(tabview, name, tabdata)
 			"button[3.5,4.5;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
 			"button[6,4.5;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
 			"button[8.7,4.5;3.30,0.5;play;".. fgettext("Play") .. "]" ..
-			"checkbox[0.25,4;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
+			"checkbox[0.0,4;cb_creative_mode;".. fgettext("Creative Inventory") .. ";" ..
 			dump(core.setting_getbool("creative_mode")) .. "]"..
-			"checkbox[0.25,4.5;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
+			"checkbox[0.0,4.5;cb_enable_damage;".. fgettext("Survival Mode") .. ";" ..
 			dump(core.setting_getbool("enable_damage")) .. "]"..
 			"textlist[0,0;11.75,3.7;sp_worlds;" ..
 			menu_render_worldlist() ..
@@ -108,7 +108,7 @@ local function main_button_handler(this, fields, name, tabdata)
 		create_world_dlg:set_parent(this)
 		this:hide()
 		create_world_dlg:show()
-		mm_texture.update("singleplayer",current_game())
+		--mm_texture.update("singleplayer",current_game())
 		return true
 	end
 
@@ -125,7 +125,7 @@ local function main_button_handler(this, fields, name, tabdata)
 				delete_world_dlg:set_parent(this)
 				this:hide()
 				delete_world_dlg:show()
-				mm_texture.update("singleplayer",current_game())
+				--mm_texture.update("singleplayer",current_game())
 			end
 		end
 		
@@ -143,7 +143,7 @@ local function main_button_handler(this, fields, name, tabdata)
 				configdialog:set_parent(this)
 				this:hide()
 				configdialog:show()
-				mm_texture.update("singleplayer",current_game())
+				--mm_texture.update("singleplayer",current_game())
 			end
 		end
 		
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 731d3c407..b758a961c 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3825,7 +3825,7 @@ Definition tables
     --  ^ vertical: if true faces player using y axis only
         texture = "image.png",
     --  ^ Uses texture (string)
-        playername = "singleplayer"
+        playername = "Player"
     --  ^ optional, if specified spawns particle only on the player's client
     }
 
@@ -3854,7 +3854,7 @@ Definition tables
     --  ^ vertical: if true faces player using y axis only
         texture = "image.png",
     --  ^ Uses texture (string)
-        playername = "singleplayer"
+        playername = "Player"
     --  ^ Playername is optional, if specified spawns particle only on the player's client
     }
 
diff --git a/fonts/DroidSansFallbackFull.ttf b/fonts/DroidSansFallback.ttf
similarity index 62%
rename from fonts/DroidSansFallbackFull.ttf
rename to fonts/DroidSansFallback.ttf
index 89959f52f..96b16bb1c 100644
Binary files a/fonts/DroidSansFallbackFull.ttf and b/fonts/DroidSansFallback.ttf differ
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 423a2fe6a..c30a79ed4 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -410,7 +410,7 @@ bool ClientLauncher::launch_game(std::string &error_message,
 	// If using simple singleplayer mode, override
 	if (simple_singleplayer_mode) {
 		assert(skip_main_menu == false);
-		current_playername = "singleplayer";
+		current_playername = "Player";
 		current_password = "";
 		current_address = "";
 		current_port = myrand_range(49152, 65535);
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index acf86a90f..4dda3fc8e 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -204,15 +204,15 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("font_shadow", "1");
 	settings->setDefault("font_shadow_alpha", "128");
 	settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf"));
-	settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
+	settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallback.ttf"));
 
 	settings->setDefault("fallback_font_shadow", "1");
 	settings->setDefault("fallback_font_shadow_alpha", "128");
 
 	std::stringstream fontsize;
-	fontsize << TTF_DEFAULT_FONT_SIZE;
+	fontsize << DEFAULT_FONT_SIZE;
 
-	settings->setDefault("font_size", fontsize.str());
+	settings->setDefault("font_size", "16");
 	settings->setDefault("mono_font_size", fontsize.str());
 	settings->setDefault("fallback_font_size", fontsize.str());
 #else
@@ -342,9 +342,9 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("smooth_lighting", "false");
 	settings->setDefault("emergequeue_limit_diskonly", "8");
 	settings->setDefault("emergequeue_limit_generate", "8");
-	settings->setDefault("max_block_generate_distance", "3");
+	settings->setDefault("max_block_generate_distance", "2");
 	settings->setDefault("enable_3d_clouds", "false");
-	settings->setDefault("fps_max", "35");
+	settings->setDefault("fps_max", "40");
 	settings->setDefault("pause_fps_max", "10");
 	settings->setDefault("max_objects_per_block", "32");
 	settings->setDefault("sqlite_synchronous", "1");
@@ -355,6 +355,8 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("viewing_range", "25");
 	settings->setDefault("inventory_image_hack", "false");
 	settings->setDefault("doubletap_jump", "true");
+	settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
+	settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");
 
 	//check for device with small screen
 	float x_inches = ((double) porting::getDisplaySize().X /
@@ -362,10 +364,12 @@ void set_default_settings(Settings *settings)
 	if (x_inches < 3.5) {
 		settings->setDefault("hud_scaling", "0.55");
 		settings->setDefault("mouse_sensitivity", "0.1");
+		settings->setDefault("font_size","12");
 	}
 	else if (x_inches < 5.5) {
 		settings->setDefault("hud_scaling", "0.65");
 		settings->setDefault("mouse_sensitivity", "0.1");
+		settings->setDefault("font_size","14");
 	}
 #endif
 }
diff --git a/src/game.cpp b/src/game.cpp
index 8ba391b3a..b681d6f58 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2624,7 +2624,7 @@ void Game::processUserInput(VolatileRunFlags *flags,
 #endif
 
 	// Increase timer for double tap of "keymap_jump"
-	if (m_cache_doubletap_jump && runData->jump_timer <= 0.2)
+	if (m_cache_doubletap_jump && runData->jump_timer <= 0.15)
 		runData->jump_timer += dtime;
 
 	processKeyboardInput(
@@ -2834,7 +2834,7 @@ void Game::toggleFreeMove(float *statustext_time)
 
 void Game::toggleFreeMoveAlt(float *statustext_time, float *jump_timer)
 {
-	if (m_cache_doubletap_jump && *jump_timer < 0.2f)
+	if (m_cache_doubletap_jump && *jump_timer < 0.15f)
 		toggleFreeMove(statustext_time);
 }
 
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 97c6d9898..7d179b56f 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -185,8 +185,8 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 
 	std::string legacyPlayerNameCasing = playerName;
 
-	if (!isSingleplayer() && strcasecmp(playername, "singleplayer") == 0) {
-		actionstream << "Server: Player with the name \"singleplayer\" "
+	if (!isSingleplayer() && strcasecmp(playername, "Player") == 0) {
+		actionstream << "Server: Player with the name \"Player\" "
 				<< "tried to connect from " << addr_s << std::endl;
 		DenyAccess(pkt->getPeerId(), SERVER_ACCESSDENIED_WRONG_NAME);
 		return;
@@ -475,8 +475,8 @@ void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
 		return;
 	}
 
-	if (!isSingleplayer() && strcasecmp(playername, "singleplayer") == 0) {
-		actionstream << "Server: Player with the name \"singleplayer\" "
+	if (!isSingleplayer() && strcasecmp(playername, "Player") == 0) {
+		actionstream << "Server: Player with the name \"Player\" "
 				<< "tried to connect from " << addr_s << std::endl;
 		DenyAccess_Legacy(pkt->getPeerId(), L"Name is not allowed");
 		return;