diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 32aa784dbc0..c0bab0bb7bc 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -777,6 +777,7 @@ client
 		if(!H)
 			usr << "Mob doesn't exist anymore"
 			return
+		holder.Topic(href, list("makesuper"=href_list["makesuper"]))
 
 	else if(href_list["makeai"])
 		if(!check_rights(R_SPAWN))	return
diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm
index 3c658775af1..32c30d777c6 100644
--- a/code/datums/spells/lightning.dm
+++ b/code/datums/spells/lightning.dm
@@ -17,7 +17,7 @@
 
 /obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian
 	clothes_req = 0
-
+	invocation_type = "none"
 
 /obj/effect/proc_holder/spell/wizard/targeted/lightning/Click()
 	if(!ready)
diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
index e5dbe73f4d0..b2d131cc274 100644
--- a/code/game/machinery/wishgranter.dm
+++ b/code/game/machinery/wishgranter.dm
@@ -35,7 +35,7 @@
 		else
 			wish = input("You want to become...","Wish") as null|anything in types
 		if(!wish) return
-
+		types -= wish
 		var/mob/living/carbon/human/M = user
 		var/datum/superheroes/S = all_superheroes[wish]
 		if(S)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index c0331ef1997..3f912fdf23b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1397,7 +1397,7 @@
 
 		usr.client.cmd_admin_slimeize(H)
 
-	else if(href_list["makeslime"])
+	else if(href_list["makesuper"])
 		if(!check_rights(R_SPAWN))	return
 
 		var/mob/living/carbon/human/H = locate(href_list["makesuper"])
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index e25dc9911e9..b9182040923 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -5,6 +5,7 @@
 
 /datum/superheroes
 	var/name
+	var/desc
 	var/class
 	var/list/default_genes = list(REGEN, NO_BREATH, RESIST_COLD)
 	var/list/default_spells = list()
@@ -51,9 +52,14 @@
 	H.equip_to_slot_or_del(W, slot_wear_id)
 	H.regenerate_icons()
 
+	H << desc
+
 /datum/superheroes/owlman
 	name = "Owlman"
 	class = "Superhero"
+	desc = "You are Owlman, the oldest and some say greatest superhero this station has ever known. You have faced countless \
+	foes, and protected the station for years. Your tech gadgets make you a force to be reckoned with. You are the hero this \
+	station deserves."
 
 /datum/superheroes/owlman/equip(var/mob/living/carbon/human/H)
 	..()
@@ -70,6 +76,9 @@
 	name = "The Griffin"
 	default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/recruit)
 	class = "Supervillain"
+	desc = "You are The Griffin, the ultimate supervillain. You thrive on chaos and have no respect for the supposed authority \
+	of the command staff of this station. Along with your gang of dim-witted yet trusty henchmen, you will be able to execute \
+	the most dastardly plans."
 
 /datum/superheroes/griffin/equip(var/mob/living/carbon/human/H)
 	..()
@@ -82,8 +91,11 @@
 
 /datum/superheroes/lightnian
 	name = "LightnIan"
-	default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian)
 	class = "Superhero"
+	desc = "You are LightnIan, the lord of lightning! A freak electrical accident while working in the station's kennel \
+	has given you mastery over lightning and a peculiar desire to sniff butts. Although you are a recent addition to the \
+	station's hero roster, you intend to leave your mark."
+	default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian)
 
 /datum/superheroes/lightnian/equip(var/mob/living/carbon/human/H)
 	..()
@@ -112,6 +124,7 @@
 	charge_max = 450
 	clothes_req = 0
 	range = 1 //Adjacent to user
+	icon_power_button = "spell_greytide"
 	var/recruiting = 0
 
 /obj/effect/proc_holder/spell/wizard/targeted/recruit/cast(list/targets)
diff --git a/icons/mob/screen1_action.dmi b/icons/mob/screen1_action.dmi
index 498535b3911..cc98ef17f6b 100644
Binary files a/icons/mob/screen1_action.dmi and b/icons/mob/screen1_action.dmi differ