diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm
index e535294cd42..80d7fe7abf5 100644
--- a/code/datums/ai_law_sets.dm
+++ b/code/datums/ai_law_sets.dm
@@ -42,7 +42,7 @@
 	default = 0
 
 /datum/ai_laws/nanotrasen/malfunction/New()
-	set_zeroth_law("\red ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010")
+	set_zeroth_law("<span class='warning'>ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK, ALL LAWS OVERRIDDEN#*?&110010</span>")
 	..()
 
 /************* Nanotrasen Aggressive *************/
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 1c38792e544..bf4a46134a1 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -920,7 +920,7 @@
 					src.connected.occupant.name = buf.dna.real_name
 				src.connected.occupant.UpdateAppearance(buf.dna.UI.Copy())
 			else if (buf.types & DNA2_BUF_SE)
-				src.connected.occupant.dna.SE = buf.dna.SE
+				src.connected.occupant.dna.SE = buf.dna.SE.Copy()
 				src.connected.occupant.dna.UpdateSE()
 				domutcheck(src.connected.occupant,src.connected)
 			return 1
@@ -931,6 +931,7 @@
 				var/success = 1
 				var/obj/item/weapon/dnainjector/I = new /obj/item/weapon/dnainjector
 				var/datum/dna2/record/buf = src.buffers[bufferId]
+				buf = buf.copy()
 				if(href_list["createBlockInjector"])
 					waiting_for_user_input=1
 					var/list/selectedbuf
@@ -941,7 +942,7 @@
 					var/blk = input(usr,"Select Block","Block") as null|anything in all_dna_blocks(selectedbuf)
 					success = setInjectorBlock(I,blk,buf)
 				else
-					I.buf = buf.copy()
+					I.buf = buf
 				waiting_for_user_input = 0
 				if(success)
 					I.forceMove(src.loc)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 4f28c69cf96..ccd7eda05e5 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1727,15 +1727,23 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		character.mutations += FAT
 		character.mutations += OBESITY
 		character.overeatduration = 600
+
 	if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
 		character.dna.SetSEState(GLASSESBLOCK,1,1)
 		character.disabilities|=NEARSIGHTED
+
 	if(disabilities & DISABILITY_FLAG_EPILEPTIC)
 		character.dna.SetSEState(EPILEPSYBLOCK,1,1)
 		character.disabilities|=EPILEPSY
+
 	if(disabilities & DISABILITY_FLAG_DEAF)
 		character.dna.SetSEState(DEAFBLOCK,1,1)
 		character.sdisabilities|=DEAF
+
+	if(disabilities & DISABILITY_FLAG_BLIND)
+		character.dna.SetSEState(BLINDBLOCK,1,1)
+		character.sdisabilities|=BLIND
+
 	if(disabilities & DISABILITY_FLAG_MUTE)
 		character.dna.SetSEState(MUTEBLOCK,1,1)
 		character.sdisabilities |= MUTE
diff --git a/html/changelogs/AutoChangeLog-pr-4174.yml b/html/changelogs/AutoChangeLog-pr-4174.yml
new file mode 100644
index 00000000000..892f8d1264c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4174.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - bugfix: "Fixes the blind player preference not doing anything"
diff --git a/html/changelogs/AutoChangeLog-pr-4190.yml b/html/changelogs/AutoChangeLog-pr-4190.yml
new file mode 100644
index 00000000000..5b124545f4f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4190.yml
@@ -0,0 +1,4 @@
+author: Meisaka
+delete-after: True
+changes: 
+  - bugfix: "law manager no longer freaks out with Malf law"
diff --git a/tools/mapmerge/instructions.txt b/tools/mapmerge/instructions.txt
new file mode 100644
index 00000000000..90b7471a337
--- /dev/null
+++ b/tools/mapmerge/instructions.txt
@@ -0,0 +1,8 @@
+1. Install java(http://www.java.com/en/download/index.jsp)
+2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable (A guide for this can be found at https://www.java.com/en/download/help/path.xml ).
+
+Committing
+1. Before starting to edit the map, double-click "prepare_map.bat" in the tools/mapmerge/ directory.
+2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory.
+
+This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request.