diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm
index 687461d07b..18ce83f7eb 100644
--- a/code/game/gamemodes/technomancer/catalog.dm
+++ b/code/game/gamemodes/technomancer/catalog.dm
@@ -40,7 +40,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) -
 	var/tab = 4 // Info tab, so new players can read it before doing anything.
 	var/spell_tab = ALL_SPELLS
 	var/show_scepter_text = 0
-	
+
 /obj/item/weapon/technomancer_catalog/apprentice
 	name = "apprentice's catalog"
 	budget = 700
@@ -50,7 +50,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) -
 	name = "master's catalog"
 	budget = 2000
 	max_budget = 2000
-	
+
 /obj/item/weapon/technomancer_catalog/admeme //for badmins, I suppose
 	name = "admeme's catalog"
 	budget = 20000
diff --git a/code/game/gamemodes/technomancer/trainee.dm b/code/game/gamemodes/technomancer/trainee.dm
index 34d500e659..960fee19de 100644
--- a/code/game/gamemodes/technomancer/trainee.dm
+++ b/code/game/gamemodes/technomancer/trainee.dm
@@ -1,7 +1,7 @@
-var/list/all_trainee_defense = (/datum/technomancer/spell/reflect,/datum/technomancer/spell/shield)
-var/list/all_trainee_offense = (/datum/technomancer/spell/flame_tongue,/datum/technomancer/spell/warp_strike,/datum/technomancer/spell/beam,/datum/technomancer/spell/force_missile,/datum/technomancer/spell/lesser_chain_lightning)
-var/list/all_trainee_utility = (/datum/technomancer/spell/abjuration,/datum/technomancer/spell/audible_deception,/datum/technomancer/spell/chroma,/datum/technomancer/spell/condensation,/datum/technomancer/spell/energy_siphon,/datum/technomancer/spell/illusion,/datum/technomancer/spell/mark,/datum/technomancer/spell/recall,/datum/technomancer/spell/track,/datum/technomancer/spell/darkness,/datum/technomancer/spell/summon_ward)
-var/list/all_trainee_support = (/datum/technomancer/spell/dispel,/datum/technomancer/spell/oxygenate,/datum/technomancer/spell/corona,/datum/technomancer/spell/haste,/datum/technomancer/spell/mend_life,/datum/technomancer/spell/mend_synthetic,/datum/technomancer/spell/purify)
+var/list/all_trainee_defense = list(/datum/technomancer/spell/reflect,/datum/technomancer/spell/shield)
+var/list/all_trainee_offense = list(/datum/technomancer/spell/flame_tongue,/datum/technomancer/spell/warp_strike,/datum/technomancer/spell/beam,/datum/technomancer/spell/force_missile,/datum/technomancer/spell/lesser_chain_lightning)
+var/list/all_trainee_utility = list(/datum/technomancer/spell/abjuration,/datum/technomancer/spell/audible_deception,/datum/technomancer/spell/chroma,/datum/technomancer/spell/condensation,/datum/technomancer/spell/energy_siphon,/datum/technomancer/spell/illusion,/datum/technomancer/spell/mark,/datum/technomancer/spell/recall,/datum/technomancer/spell/track,/datum/technomancer/spell/darkness,/datum/technomancer/spell/summon_ward)
+var/list/all_trainee_support = list(/datum/technomancer/spell/dispel,/datum/technomancer/spell/oxygenate,/datum/technomancer/spell/corona,/datum/technomancer/spell/haste,/datum/technomancer/spell/mend_life,/datum/technomancer/spell/mend_synthetic,/datum/technomancer/spell/purify)
 
 /obj/item/weapon/technomancer_catalog/trainee
     name = "trainee's catalog"
diff --git a/code/modules/vore/fluffstuff/guns/bsharpoon.dm b/code/modules/vore/fluffstuff/guns/bsharpoon.dm
index 9806b1c700..f72ca2b2fe 100644
--- a/code/modules/vore/fluffstuff/guns/bsharpoon.dm
+++ b/code/modules/vore/fluffstuff/guns/bsharpoon.dm
@@ -117,19 +117,19 @@
 	if(!user || !A)
 		return
 	if(transforming)
-		to_chat(user,"<span class = 'warning'>You can't fire while \the [src] transforming!</span>")
+		to_chat(user,"<span class = 'warning'>You can't use while \the [src] transforming!</span>")
 		return
 	if(!(current_fire - last_fire >= 30 SECONDS))
 		to_chat(user,"<span class = 'warning'>\The [src] is recharging...</span>")
 		return
 	if(is_jammed(A) || is_jammed(user))
-		to_chat(user,"<span class = 'warning'>\The [src] shot fizzles due to interference!</span>")
+		to_chat(user,"<span class = 'warning'>\The [src] magic fizzles due to interference!</span>")
 		last_fire = current_fire
 		playsound(user, 'sound/weapons/wave.ogg', 60, 1)
 		return
 	var/turf/T = get_turf(A)
 	if(!T || T.check_density())
-		to_chat(user,"<span class = 'warning'>That's a little too solid to harpoon into!</span>")
+		to_chat(user,"<span class = 'warning'>That's a little too solid to teleport into!</span>")
 		return
 	var/turf/ownturf = get_turf(src)
 	if(ownturf.z != T.z || get_dist(T,ownturf) > world.view)
@@ -139,7 +139,7 @@
 	last_fire = current_fire
 	playsound(user, 'sound/weapons/wave.ogg', 60, 1)
 
-	user.visible_message("<span class='warning'>[user] fires \the [src]!</span>","<span class='warning'>You fire \the [src]!</span>")
+	user.visible_message("<span class='warning'>[user] uses \the [src]!</span>","<span class='warning'>You use \the [src]!</span>")
 
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(4, 1, A)
@@ -168,10 +168,22 @@
 	return chande_fire_mode(user)
 
 /obj/item/weapon/teleport_cane/verb/chande_fire_mode(mob/user as mob)
-	set name = "Change fire mode"
+	set name = "Change use mode"
 	set category = "Object"
 	set src in oview(1)
 	if(transforming) return
 	mode = !mode
 	transforming = 1
 	to_chat(user,"<span class = 'info'>You change \the [src]'s mode to [mode ? "transmiting" : "receiving"].</span>")
+	update_icon()
+
+/obj/item/weapon/teleport_cane/update_icon()
+	if(transforming)
+		switch(mode)
+			if(0)
+				flick("cane", src)
+				icon_state = "cane"
+			if(1)
+				flick("cane",src)
+				icon_state = "cane"
+		transforming = 0
\ No newline at end of file