diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp
index 0e9cfb191d..6265aa0f40 100644
--- a/Minecraft.Client/DeathScreen.cpp
+++ b/Minecraft.Client/DeathScreen.cpp
@@ -9,7 +9,7 @@ void DeathScreen::init()
 {
     buttons.clear();
     buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 3, L"Respawn"));
-    buttons.push_back(new Button(2, width / 2 - 100, height / 4 + 24 * 4, L"Title menu"));
+    buttons.push_back(new Button(2, width / 2 - 100, height / 4 + 24 * 4, L"Exit to Title Menu"));
 
     if (minecraft->user == nullptr)
 	{
@@ -46,7 +46,7 @@ void DeathScreen::render(int xm, int ym, float a)
 
     glPushMatrix();
     glScalef(2, 2, 2);
-    drawCenteredString(font, L"Game over!", width / 2 / 2, 60 / 2, 0xffffff);
+    drawCenteredString(font, L"Game Over!", width / 2 / 2, 60 / 2, 0xffffff);
     glPopMatrix();
     drawCenteredString(font, L"Score: &e" + std::to_wstring( minecraft->player->getScore() ), width / 2, 100, 0xffffff);
 
@@ -64,4 +64,4 @@ void DeathScreen::render(int xm, int ym, float a)
 bool DeathScreen::isPauseScreen()
 {
 	return false;
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/NameEntryScreen.cpp b/Minecraft.Client/NameEntryScreen.cpp
index f498d4ea33..0b0a97e23b 100644
--- a/Minecraft.Client/NameEntryScreen.cpp
+++ b/Minecraft.Client/NameEntryScreen.cpp
@@ -53,7 +53,7 @@ void NameEntryScreen::buttonClicked(Button button)
 void NameEntryScreen::keyPressed(wchar_t ch, int eventKey)
 {
     if (eventKey == Keyboard::KEY_BACK && name.length() > 0) name = name.substr(0, name.length() - 1);
-    if (allowedChars.find(ch) != wstring::npos && name.length()<64)
+    if (allowedChars.find(ch) != wstring::npos && name.length()<100)
     {
         name += ch;
     }
@@ -75,4 +75,4 @@ void NameEntryScreen::render(int xm, int ym, float a)
     drawString(font, name + (frame / 6 % 2 == 0 ? L"_" : L""), bx + 4, by + (bh - 8) / 2, 0xe0e0e0);
 
     Screen::render(xm, ym, a);
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/PauseScreen.cpp b/Minecraft.Client/PauseScreen.cpp
index a17e52dfb0..d6d74eab85 100644
--- a/Minecraft.Client/PauseScreen.cpp
+++ b/Minecraft.Client/PauseScreen.cpp
@@ -21,14 +21,14 @@ void PauseScreen::init()
     saveStep = 0;
     buttons.clear();
     int yo = -16;
-    buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + yo, L"Save and quit to title"));
+    buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + yo, L"Save and Quit"));
     if (minecraft->isClientSide())
 	{
-        buttons[0]->msg = L"Disconnect";
+        buttons[0]->msg = L"Disconnect from Server";
     }
 
 
-    buttons.push_back(new Button(4, width / 2 - 100, height / 4 + 24 * 1 + yo, L"LBack to game"));
+    buttons.push_back(new Button(4, width / 2 - 100, height / 4 + 24 * 1 + yo, L"LBack to Game"));
     buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 4 + yo, L"LOptions..."));
 
     buttons.push_back(new Button(5, width / 2 - 100, height / 4 + 24 * 2 + yo, 98, 20, I18n::get(L"gui.achievements")));
@@ -90,10 +90,10 @@ void PauseScreen::render(int xm, int ym, float a)
         col = Mth::sin(col * PI * 2) * 0.2f + 0.8f;
         int br = static_cast<int>(255 * col);
 
-        drawString(font, L"Saving level..", 8, height - 16, br << 16 | br << 8 | br);
+        drawString(font, L"Saving World..", 8, height - 16, br << 16 | br << 8 | br);
     }
 
-    drawCenteredString(font, L"Game menu", width / 2, 40, 0xffffff);
+    drawCenteredString(font, L"Game Menu", width / 2, 40, 0xffffff);
 
     Screen::render(xm, ym, a);
-}
\ No newline at end of file
+}
diff --git a/Minecraft.World/Level.h b/Minecraft.World/Level.h
index 2be8747229..a5f77df8ca 100644
--- a/Minecraft.World/Level.h
+++ b/Minecraft.World/Level.h
@@ -63,8 +63,8 @@ class Level : public LevelSource
 
 
 public:
-	static const int MAX_XBOX_BOATS = 40;										// Max number of boats
-	static const int MAX_CONSOLE_MINECARTS = 40;
+	static const int MAX_XBOX_BOATS = 50;										// Max number of boats
+	static const int MAX_CONSOLE_MINECARTS = 50;
 	static const int MAX_DISPENSABLE_FIREBALLS = 200;
 	static const int MAX_DISPENSABLE_PROJECTILES = 300;