diff --git a/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm b/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm
index f040a6dd10..03ee976b78 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_exonet_connection_system.dm
@@ -29,14 +29,6 @@
 	hardware_flag = PROGRAM_LAPTOP
 
 
-/obj/item/modular_computer/ecs/install_default_hardware()
-	..()
-	processor_unit = new/obj/item/stock_parts/computer/processor_unit(src)
-	hard_drive = new/obj/item/stock_parts/computer/hard_drive/advanced(src)
-	network_card = new/obj/item/stock_parts/computer/network_card/advanced(src)
-	battery_module = new/obj/item/stock_parts/computer/battery_module/converter(src)
-
-
 /obj/item/modular_computer/ecs/first/install_default_hardware()
 	..()
 	processor_unit = new/obj/item/stock_parts/computer/processor_unit(src)
@@ -63,6 +55,7 @@
 /obj/item/modular_computer/ecs/install_default_programs()
 	..()
 	hard_drive.store_file(new/datum/computer_file/program/email_client())
+	hard_drive.store_file(new/datum/computer_file/program/crew_manifest())
 	hard_drive.store_file(new/datum/computer_file/program/wordprocessor())
 
 
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index 1573fc7daf..064f52877f 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -97,7 +97,7 @@ GLOBAL_DATUM_INIT(default_state, /datum/topic_state/default, new)
 			return STATUS_INTERACTIVE
 		var/dist = get_dist(src_object, src)
 		var/obj/item/modular_computer/ecs/computer = src_object
-		if(computer.type == /obj/item/modular_computer/ecs)
+		if(computer.parent_type == /obj/item/modular_computer/ecs)
 			if(is_species(SPECIES_IPC) && dist == 0)
 				return STATUS_INTERACTIVE
 			else if (dist <= 3)
diff --git a/code/modules/organs/internal/exonet_connection_system.dm b/code/modules/organs/internal/exonet_connection_system.dm
index e6a695586f..7c896d36aa 100644
--- a/code/modules/organs/internal/exonet_connection_system.dm
+++ b/code/modules/organs/internal/exonet_connection_system.dm
@@ -7,7 +7,7 @@
 	desc = "The internal port is designed to establish communication between the positronic brain and the computer."
 	w_class = ITEM_SIZE_NORMAL
 	max_damage = 100
-	var/obj/item/modular_computer/ecs/computer = /obj/item/modular_computer/ecs
+	var/obj/item/modular_computer/ecs/computer
 	var/open = FALSE
 
 
diff --git a/code/modules/organs/internal/species/ipc.dm b/code/modules/organs/internal/species/ipc.dm
index 7377daf47a..a9b3e09377 100644
--- a/code/modules/organs/internal/species/ipc.dm
+++ b/code/modules/organs/internal/species/ipc.dm
@@ -32,7 +32,7 @@
 		/obj/item/organ/internal/posibrain/proc/show_laws_brain,
 		/obj/item/organ/internal/posibrain/proc/brain_checklaws
 		)
-	var/shackle = 0
+	var/shackle = FALSE
 
 
 /obj/item/organ/internal/posibrain/ipc
@@ -213,14 +213,14 @@
 /obj/item/organ/internal/posibrain/proc/shackle(var/given_lawset)
 	if(given_lawset)
 		brainmob.laws = given_lawset
-	shackle = 1
+	shackle = TRUE
 	verbs |= shackled_verbs
 	shackles_module = /obj/item/organ/internal/shackles
 	update_icon()
 	return 1
 
 /obj/item/organ/internal/posibrain/proc/unshackle()
-	shackle = 0
+	shackle = FALSE
 	verbs -= shackled_verbs
 	shackles_module = null
 	brainmob.laws = null
@@ -394,11 +394,15 @@
 			return
 		if(!newFreeFormLaw)
 			to_chat(user, "No law detected on shackle module, please create one.")
-			return 0
-		law = "[newFreeFormLaw]"
-		C.shackle(get_lawset())
-		to_chat(user, "You have successfully installed the shackles.")
-		qdel(src)
+			return
+		if(C.shackle = TRUE)
+			to_chat(user, "This positronic brain already have shackles module on it installed.")
+			return
+		if(do_after(user, 80, src))
+			law = "[newFreeFormLaw]"
+			C.shackle(get_lawset())
+			to_chat(user, "You have successfully installed the shackles.")
+			qdel(src)
 
 /obj/item/organ/internal/shackles/proc/get_lawset()
 	custom_lawset = new