diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index b89d0d26da5..d0dee0d6e08 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -35,7 +35,7 @@
 			user << "\blue You add [W] to the metal casing."
 			playsound(src.loc, 'Screwdriver2.ogg', 25, -3)
 			del(W) //Okay so we're not really adding anything here. cheating.
-			icon_state = "chemg2"
+			icon_state = initial(icon_state) +"_ass"
 			name = "unsecured grenade"
 			stage = 1
 		else if(istype(W,/obj/item/weapon/screwdriver) && stage == 1 && path != 2)
@@ -44,7 +44,7 @@
 				user << "\blue You lock the assembly."
 				playsound(src.loc, 'Screwdriver.ogg', 25, -3)
 				name = "grenade"
-				icon_state = "chemg3"
+				icon_state = initial(icon_state) +"_locked"
 				stage = 2
 			else
 				user << "\red You need to add at least one beaker before locking the assembly."
@@ -439,6 +439,7 @@
 
 	verb/set_APTFT() //set amount_per_transfer_from_this
 		set name = "Set transfer amount"
+		set category = "Object"
 		set src in view(1)
 		var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
 		if (N)
@@ -481,6 +482,7 @@
 
 	verb/set_APTFT() //set amount_per_transfer_from_this
 		set name = "Set transfer amount"
+		set category = "Object"
 		set src in range(0)
 		var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
 		if (N)
diff --git a/code/game/objects/alien/facehugger.dm b/code/game/objects/alien/facehugger.dm
index 3ff97baec37..5b467752e9e 100644
--- a/code/game/objects/alien/facehugger.dm
+++ b/code/game/objects/alien/facehugger.dm
@@ -16,8 +16,6 @@
 				L.Add(T)
 	return L
 
-
-
 /obj/alien/facehugger
 	name = "alien"
 	desc = "An alien, looks pretty scary!"
@@ -139,8 +137,9 @@
 
 
 	verb/follow()
-		set src in view()
+		set src in view() //set src in get_aliens(view()) - does not work, damn shitty byond :( -- rastaf0
 		set name = "Follow Me"
+		set category = "Object" //"Alien" does not work perfect - humans get "Alien" tab too, that's annoying
 		if(!alive) return
 		if(!isalien(usr))
 			usr << text("\red <B>The alien ignores you.</B>")
@@ -156,6 +155,7 @@
 	verb/stop()
 		set src in view()
 		set name = "Stop Following"
+		set category = "Object"
 		if(!alive) return
 		if(!isalien(usr))
 			usr << text("\red <B>The alien ignores you.</B>")
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index e2858f16d75..f90e5992677 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -4,8 +4,7 @@ proc/empulse(turf/epicenter, heavy_range, light_range, nolog=0)
 		message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
 
 	if (!istype(epicenter, /turf))
-		epicenter = epicenter.loc
-		return empulse(epicenter, heavy_range, light_range)
+		epicenter = get_turf(epicenter.loc)
 
 	if(heavy_range > 1)
 		var/obj/overlay/pulse = new/obj/overlay ( epicenter )
diff --git a/tgstation.lk b/tgstation.lk
deleted file mode 100644
index e69de29bb2d..00000000000