diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 005d0855e..761dcbe6f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -21,10 +21,10 @@ Luksor
 M10360
 marmot21
 Masy98
+mathias-github
 mborland
 mgueydan
 MikeHunsinger
-missingchar (mathias-github)
 mtilden
 nesco
 NiLSPACE (formerly STR_Warrior)
diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index b253626cd..97e17c7c6 100644
--- a/Server/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
@@ -662,7 +662,7 @@ function OnPlayerJoined(a_Player)
 	-- Send an example composite chat message to the player:
 	a_Player:SendMessage(cCompositeChat()
 		:AddTextPart("Hello, ")
-		:AddUrlPart(a_Player:GetName(), "http://www.mc-server.org", "u@2")  -- Colored underlined link
+		:AddUrlPart(a_Player:GetName(), "http://cuberite.org", "u@2")  -- Colored underlined link
 		:AddSuggestCommandPart(", and welcome.", "/help", "u")       -- Underlined suggest-command
 		:AddRunCommandPart(" SetDay", "/time set 0")                 -- Regular text that will execute command when clicked
 		:SetMessageType(mtJoin)                                      -- It is a join-message
diff --git a/Server/Plugins/APIDump/InfoFile.html b/Server/Plugins/APIDump/InfoFile.html
index baba2d27c..7f350f9f2 100644
--- a/Server/Plugins/APIDump/InfoFile.html
+++ b/Server/Plugins/APIDump/InfoFile.html
@@ -234,8 +234,8 @@ RegisterPluginInfoConsoleCommands()
 
 			<p>There are several plugins that already implement this approach. You can visit them for inspiration and to see what the generated documentation looks like:</p>
 			<ul>
-				<li>Gallery plugin: <a href="https://github.com/mc-server/Gallery/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=1306">Forum</a> documentation</li>
-				<li>WorldEdit plugin: <a href="https://github.com/mc-server/WorldEdit/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=870">Forum</a> and <a href="https://github.com/mc-server/WorldEdit">MarkDown</a> documentation</li>
+				<li>Gallery plugin: <a href="https://github.com/cuberite/gallery/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=1306">Forum</a> documentation</li>
+				<li>WorldEdit plugin: <a href="https://github.com/cuberite/WorldEdit/blob/master/Info.lua">Info.lua</a>, <a href="http://forum.mc-server.org/showthread.php?tid=870">Forum</a> and <a href="https://github.com/cuberite/WorldEdit">MarkDown</a> documentation</li>
 			</ul>
 
 			<script>
diff --git a/Server/Plugins/Debuggers/Debuggers.lua b/Server/Plugins/Debuggers/Debuggers.lua
index 5b7f26fe6..422993932 100644
--- a/Server/Plugins/Debuggers/Debuggers.lua
+++ b/Server/Plugins/Debuggers/Debuggers.lua
@@ -1557,7 +1557,7 @@ function OnPlayerJoined(a_Player)
 	-- Test composite chat chaining:
 	a_Player:SendMessage(cCompositeChat()
 		:AddTextPart("Hello, ")
-		:AddUrlPart(a_Player:GetName(), "http://www.mc-server.org", "u@2")
+		:AddUrlPart(a_Player:GetName(), "http://cuberite.org", "u@2")
 		:AddSuggestCommandPart(", and welcome.", "/help", "u")
 		:AddRunCommandPart(" SetDay", "/time set 0")
 	)
diff --git a/docs/Generator.html b/docs/Generator.html
index 3d4e09afe..c852d8bf0 100644
--- a/docs/Generator.html
+++ b/docs/Generator.html
@@ -503,7 +503,7 @@ there should be more lava springs and almost no water springs near the bottom. T
 Cuberite team has made a tool that scanned through MineCraft's terrain and counted the amount of both types
 of springs in relation to their height. Two curves have been found for the distribution of each type of the
 spring:</p>
-<img src="http://mc-server.xoft.cz/img/vanilla_springs_huge.png" />
+<img src="img/vanilla_springs_huge.png" />
 
 <p>Cuberite uses an approximation of the above curves to choose the height at which to generate the
 spring.</p>
diff --git a/docs/img/vanilla_springs_huge.png b/docs/img/vanilla_springs_huge.png
new file mode 100644
index 000000000..694389c85
Binary files /dev/null and b/docs/img/vanilla_springs_huge.png differ
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 3d325d354..385a3a3ca 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -982,7 +982,7 @@ cBlockEntity * cWSSAnvil::LoadChestFromNBT(const cParsedNBT & a_NBT, int a_TagId
 	// Check if the data has a proper type:
 	// TODO: Does vanilla use "TrappedChest" or not? MCWiki says no, but previous code says yes
 	// Ref.: http://minecraft.gamepedia.com/Trapped_Chest
-	//       https://github.com/mc-server/MCServer/blob/d0551e2e0a98a28f31a88d489d17b408e4a7d38d/src/WorldStorage/WSSAnvil.cpp#L637
+	//       https://github.com/cuberite/cuberite/blob/d0551e2e0a98a28f31a88d489d17b408e4a7d38d/src/WorldStorage/WSSAnvil.cpp#L637
 	if (!CheckBlockEntityType(a_NBT, a_TagIdx, "Chest") && !CheckBlockEntityType(a_NBT, a_TagIdx, "TrappedChest"))
 	{
 		return nullptr;