diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 54f96c491c..bcf1df44bc 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -33,7 +33,7 @@
 	var/burst_size = 1
 	/// The time between shots in burst.
 	var/burst_shot_delay = 3
-	/// The time between firing actions, this means between bursts if this is burst weapon.
+	/// The time between firing actions, this means between bursts if this is burst weapon. The reason this is 0 is because you are still, by default, limited by clickdelay.
 	var/fire_delay = 0
 	/// Last world.time this was fired
 	var/last_fire = 0
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index e77a52dfb3..b56664fe03 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -162,10 +162,10 @@
 		recharge_newshot(TRUE)
 
 /obj/item/gun/energy/proc/set_firemode_to_next(mob/user_for_feedback)
-	return set_firemode_index(current_firemode_index++, user_for_feedback)
+	return set_firemode_index(++current_firemode_index, user_for_feedback)
 
 /obj/item/gun/energy/proc/set_firemode_to_prev(mob/user_for_feedback)
-	return set_firemode_index(current_firemode_index--, user_for_feedback)
+	return set_firemode_index(--current_firemode_index, user_for_feedback)
 
 /obj/item/gun/energy/proc/get_firemode_index(casing_type)
 	var/obj/item/ammo_casing/energy/E = locate(casing_type) in ammo_type