diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 0bf96f02..dad67d01 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -1,4 +1,4 @@
-#define EMITTER_DAMAGE_POWER_TRANSFER 450 //used to transfer power to containment field generators
+#define EMITTER_DAMAGE_POWER_TRANSFER 2500 //used to transfer power to containment field generators
 
 /obj/machinery/power/emitter
 	name = "Emitter"
@@ -16,9 +16,6 @@
 	var/active = 0
 	var/powered = 0
 	var/fire_delay = 100
-	var/max_burst_delay = 100
-	var/min_burst_delay = 20
-	var/burst_shots = 3
 	var/last_shot = 0
 	var/shot_number = 0
 	var/state = 0
@@ -55,6 +52,7 @@
 	else
 		icon_state = "emitter"
 
+
 /obj/machinery/power/emitter/attack_hand(mob/user as mob)
 	src.add_fingerprint(user)
 	activate(user)
@@ -109,7 +107,8 @@
 		return
 	if(((src.last_shot + src.fire_delay) <= world.time) && (src.active == 1))
 
-		if(surplus() >= active_power_usage && add_load(active_power_usage) >= active_power_usage) //does the laser have enough power to shoot?
+		if(!active_power_usage || avail(active_power_usage))
+			add_load(active_power_usage)
 			if(!powered)
 				powered = 1
 				update_icon()
@@ -122,19 +121,13 @@
 			return
 
 		src.last_shot = world.time
-		if(src.shot_number < burst_shots)
+		if(src.shot_number < 3)
 			src.fire_delay = 2
 			src.shot_number ++
 		else
-			src.fire_delay = rand(min_burst_delay, max_burst_delay)
+			src.fire_delay = rand(20,100)
 			src.shot_number = 0
-		
-		//need to calculate the power per shot as the emitter doesn't fire continuously.
-		var/burst_time = (min_burst_delay + max_burst_delay)/2 + 2*(burst_shots-1)
-		var/power_per_shot = active_power_usage * (burst_time/10) / burst_shots
 		var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter( src.loc )
-		A.damage = round(power_per_shot/EMITTER_DAMAGE_POWER_TRANSFER)
-		
 		playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1)
 		if(prob(35))
 			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl
index 5df27d9e..e55ca052 100644
--- a/nano/templates/pda.tmpl
+++ b/nano/templates/pda.tmpl
@@ -219,8 +219,8 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
                 {{if data.cartridge.charges}}
                     <div class="item">
                         <b>{{:data.cartridge.charges}}
-                        {{if data.cartridge.access.access_detonate_pda}} detonation charges left. {{/if}}
-                        {{if data.cartridge.access.access_clown || data.cartridge.access.access_mime}} viral files left. {{/if}}
+                        {{if data.cartridge.type == "/obj/item/weapon/cartridge/syndicate"}} detonation charges left. {{/if}}
+                        {{if data.cartridge.type == "/obj/item/weapon/cartridge/clown" || data.cartridge.type == "/obj/item/weapon/cartridge/mime"}} viral files left. {{/if}}
                         </b>
                         <br><br>
                     </div>
@@ -234,14 +234,14 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
                 {{for data.convopdas}}
                     <div class="item">
                         {{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Select Conversation", 'convo' : value.Reference } , null, value.fixedLeftWider)}}
-                        {{if data.cartridge}}
-                            {{if data.cartridge.access.access_detonate_pda && value.Detonate}}
+                        {{if value.cartridge}}
+                            {{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}}
                                 {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}}
                             {{/if}}
-                            {{if data.cartridge.access.access_clown}}
+                            {{if value.cartridge.type == "/obj/item/weapon/cartridge/clown"}}
                                 {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}}
                             {{/if}}
-                            {{if data.cartridge.access.access_mime}}
+                            {{if value.cartridge.type == "/obj/item/weapon/cartridge/mime"}}
                                 {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}}
                             {{/if}}
                         {{/if}}
@@ -251,10 +251,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
                 {{for data.pdas}}
                     <div class="item">
                         {{:helper.link(value.Name, 'circle-arrow-s', {'choice' : "Message", 'target' : value.Reference}, null, value.fixedLeftWider)}}
-                        {{if data.cartridge}}
-                            {{if data.cartridge.access.access_detonate_pda && value.Detonate}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}}  {{/if}}
-                            {{if data.cartridge.access.access_clown}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}}  {{/if}}
-                            {{if data.cartridge.access.access_mime}}  {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}}  {{/if}}
+                        {{if value.cartridge}}
+                            {{if value.cartridge.type == "/obj/item/weapon/cartridge/syndicate" && value.Detonate == 1}} {{:helper.link('*Detonate*', 'radiation', {'choice' : "Detonate", 'target' : value.Reference}, null, 'fixedLeft')}}  {{/if}}
+                            {{if value.cartridge.type == "/obj/item/weapon/cartridge/clown"}} {{:helper.link('*Send Virus*', 'star', {'choice' : "Send Honk", 'target' : value.Reference}, null, 'fixedLeft')}}  {{/if}}
+                            {{if value.cartridge.type == "/obj/item/weapon/cartridge/mime"}}  {{:helper.link('*Send Virus*', 'circle-arrow-s', {'choice' : "Send Silence", 'target' : value.Reference}, null, 'fixedLeft')}}  {{/if}}
                         {{/if}}
                     </div>
                 {{/for}}
@@ -509,9 +509,9 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
 
 
 	{{else data.mode == 43}}
-        <H2>Station Power Monitors</H2>
+        <H2>Station Powermonitors</H2>
         <div class="item">
-            Select a power monitor:
+            Select A power monitor:
         </div>
         {{for data.records.powermonitors}}
             <div class="item">
@@ -522,42 +522,39 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
 
     {{else data.mode == 433}}
         <H2>Powernet Status</H2>
-		{{if data.records.powerconnected == 1}}
-			<div class="item">
-				<div class="itemLabelNarrow">
-					<b>Current Load</b>:
-				</div>
-				<div class="itemContent">
-					<span class="average">{{:data.records.powerload}} W</span>
-				</div>
-			</div>
-			<div class="item">
-				<div class="itemLabelNarrow">
-					<b>Total Power</b>:
-				</div>
-				<div class="itemContent">
-					<span class="average">{{:data.records.poweravail}} W</span>
-				</div>
-			</div>
-			<br>
-			<div class="item">
-				<table class="curvedEdges"><tbody>
-					{{for data.records.apcs}}
-						{{if index % 20 === 0}}
-							<tr class=><th>&nbsp;Area&nbsp;</th><th>&nbsp;Eqp.&nbsp;</th><th>&nbsp;Lgt.&nbsp;</th><th>&nbsp;Env&nbsp;</th><th>&nbsp;Cell&nbsp;</th></tr>
-						{{/if}}
-						<tr class=><td><span class="average">{{:value.Name}}</span></td>
-							{{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Equipment==1 ? '#4f7529' : '#8f1414')}}
-							{{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Lights==1 ? '#4f7529' : '#8f1414')}}
-							{{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Environment==1 ? '#4f7529' : '#8f1414')}}
-							{{:helper.string('<td bgcolor="{0}">{1}</td>', value.CellStatus==1 ? '#4f7529' : '#8f1414', value.CellStatus==-1 ? 'No Cell' : value.CellPct + '%')}}
-						</tr>
-					{{/for}}
-				</tbody></table>
-			</div>
-		{{else}}
-			<b>Power monitor not connected to net</b>
-		{{/if}}
+        <div class="item">
+            <div class="itemLabelNarrow">
+                <b>Current Load</b>:
+            </div>
+            <div class="itemContent">
+                <span class="average">{{:data.records.powerload}} W</span>
+            </div>
+        </div>
+        <div class="item">
+            <div class="itemLabelNarrow">
+                <b>Total Power</b>:
+            </div>
+            <div class="itemContent">
+                <span class="average">{{:data.records.poweravail}} W</span>
+            </div>
+        </div>
+        <br>
+        <div class="item">
+            <table class="curvedEdges"><tbody>
+                {{for data.records.apcs}}
+                    {{if index % 20 === 0}}
+                        <tr class=><th>&nbsp;Area&nbsp;</th><th>&nbsp;Eqp.&nbsp;</th><th>&nbsp;Lgt.&nbsp;</th><th>&nbsp;Env&nbsp;</th><th>&nbsp;Cell&nbsp;</th></tr>
+                    {{/if}}
+                    <tr class=><td><span class="average">{{:value.Name}}</span></td>
+                        {{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Equipment==1 ? '#4f7529' : '#8f1414')}}
+                        {{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Lights==1 ? '#4f7529' : '#8f1414')}}
+                        {{:helper.string('<td bgcolor="{0}">&nbsp;</td>', value.Environment==1 ? '#4f7529' : '#8f1414')}}
+                        {{:helper.string('<td bgcolor="{0}">{1}</td>', value.CellStatus==1 ? '#4f7529' : '#8f1414', value.CellStatus==-1 ? 'No Cell' : CellPct + '%')}}
+                    </tr>
+                {{/for}}
+            </tbody></table>
+        </div>
+
 
 	{{else data.mode == 44}}
 	    <H2>Medical Record List</H2>