diff --git a/docs/source/build_plugin_pages.py b/docs/source/build_plugin_pages.py
index 6e10ddb5..bba3be97 100644
--- a/docs/source/build_plugin_pages.py
+++ b/docs/source/build_plugin_pages.py
@@ -10,9 +10,9 @@
     tpc_interactions="#F44E43",
     below_cathode_interactions="#F44E43",
     interactions_in_roi="#56C46C",
-    S1_photons="#54E4CF",
-    S2_photons="#54E4CF",
-    AP_photons="#54E4CF",
+    s1_photons="#54E4CF",
+    s2_photons="#54E4CF",
+    ap_photons="#54E4CF",
     propagated_photons="#54E4CF",
     pulse_ids="#54E4CF",
     pulse_windows="#F78C27",
diff --git a/fuse/common.py b/fuse/common.py
index caef2102..2c6d3a9f 100644
--- a/fuse/common.py
+++ b/fuse/common.py
@@ -24,11 +24,9 @@ def dynamic_chunking(data, scale, n_min):
         if value <= scale:
             clusters.append(c)
             n_cluster += 1
-
         elif n_cluster + 1 < n_min:
             clusters.append(c)
             n_cluster += 1
-
         elif value > scale:
             c = c + 1
             clusters.append(c)
diff --git a/fuse/plugin.py b/fuse/plugin.py
index ff651c40..58defdd6 100644
--- a/fuse/plugin.py
+++ b/fuse/plugin.py
@@ -26,12 +26,12 @@ class FuseBasePlugin(strax.Plugin):
     deterministic_seed = straxen.URLConfig(
         default=True,
         type=bool,
-        help="Set the random seed from lineage and run_id, or pull the seed from the OS.",
+        help="Set the random seed from lineage and run_id, or pull the seed from the OS",
     )
 
     user_defined_random_seed = straxen.URLConfig(
         default=None,
-        help="Define the random seed manually. You need to set deterministic_seed to False.",
+        help="Define the random seed manually. You need to set deterministic_seed to False",
     )
 
     def setup(self):
diff --git a/fuse/plugins/detector_physics/csv_input.py b/fuse/plugins/detector_physics/csv_input.py
index 47e742b7..949b06a4 100644
--- a/fuse/plugins/detector_physics/csv_input.py
+++ b/fuse/plugins/detector_physics/csv_input.py
@@ -20,7 +20,7 @@ class ChunkCsvInput(FuseBasePlugin):
     """Plugin which reads a CSV file containing instructions for the detector
     physics simulation and returns the data in chunks."""
 
-    __version__ = "0.2.0"
+    __version__ = "0.2.1"
 
     depends_on: Tuple = tuple()
     provides = "microphysics_summary"
@@ -34,9 +34,9 @@ class ChunkCsvInput(FuseBasePlugin):
         (("x position of the cluster [cm]", "x"), np.float32),
         (("y position of the cluster [cm]", "y"), np.float32),
         (("z position of the cluster [cm]", "z"), np.float32),
-        (("Number of photons at interaction position.", "photons"), np.int32),
-        (("Number of electrons at interaction position.", "electrons"), np.int32),
-        (("Number of excitons at interaction position.", "excitons"), np.int32),
+        (("Number of photons at interaction position", "photons"), np.int32),
+        (("Number of electrons at interaction position", "electrons"), np.int32),
+        (("Number of excitons at interaction position", "excitons"), np.int32),
         (("Electric field value at the cluster position [V/cm]", "e_field"), np.float32),
         (("Energy of the cluster [keV]", "ed"), np.float32),
         (("NEST interaction type", "nestid"), np.int8),
@@ -62,15 +62,15 @@ class ChunkCsvInput(FuseBasePlugin):
     separation_scale = straxen.URLConfig(
         default=1e8,
         type=(int, float),
-        help="separation_scale",
+        help="Start a new chunk when the previous cluster is separated by this time scale",
     )
 
     source_rate = straxen.URLConfig(
         default=1,
         type=(int, float),
-        help="Source rate used to generate event times"
-        "Use a value >0 to generate event times in fuse"
-        "Use source_rate = 0 to use event times from the input file (only for csv input)",
+        help="Source rate used to generate event times. "
+        "Use a value >0 to generate event times in fuse. "
+        "Use source_rate = 0 to use event times from the input file (only for csv input).",
     )
 
     n_interactions_per_chunk = straxen.URLConfig(
@@ -150,9 +150,9 @@ def __init__(
             (("x position of the cluster [cm]", "x"), np.float32),
             (("y position of the cluster [cm]", "y"), np.float32),
             (("z position of the cluster [cm]", "z"), np.float32),
-            (("Number of photons at interaction position.", "photons"), np.int32),
-            (("Number of electrons at interaction position.", "electrons"), np.int32),
-            (("Number of excitons at interaction position.", "excitons"), np.int32),
+            (("Number of photons at interaction position", "photons"), np.int32),
+            (("Number of electrons at interaction position", "electrons"), np.int32),
+            (("Number of excitons at interaction position", "excitons"), np.int32),
             (("Electric field value at the cluster position [V/cm]", "e_field"), np.float32),
             (("Energy of the cluster [keV]", "ed"), np.float32),
             (("NEST interaction type", "nestid"), np.int8),
@@ -225,7 +225,7 @@ def output_chunk(self):
             chunk_bounds = chunk_end + np.int64(self.chunk_delay_fraction * gap_length)
             self.chunk_bounds = np.append(chunk_start[0] - self.first_chunk_left, chunk_bounds)
         else:
-            log.warning("Only one Chunk! Rate to high?")
+            log.warning("Only one Chunk! Rate too high?")
             self.chunk_bounds = [
                 chunk_start[0] - self.first_chunk_left,
                 chunk_end[0] + self.last_chunk_length,
diff --git a/fuse/plugins/detector_physics/electron_timing.py b/fuse/plugins/detector_physics/electron_timing.py
index d97dba72..7ca50c20 100644
--- a/fuse/plugins/detector_physics/electron_timing.py
+++ b/fuse/plugins/detector_physics/electron_timing.py
@@ -20,16 +20,14 @@ class ElectronTiming(FuseBasePlugin):
     extraction.
     """
 
-    __version__ = "0.2.0"
+    __version__ = "0.2.1"
 
-    depends_on = ("drifted_electrons", "extracted_electrons", "microphysics_summary")
+    depends_on = ("microphysics_summary", "drifted_electrons", "extracted_electrons")
     provides = "electron_time"
     data_kind = "individual_electrons"
 
     save_when = strax.SaveWhen.TARGET
 
-    data_kind = "individual_electrons"
-
     dtype = [
         (("x position of the electron [cm]", "x"), np.float32),
         (("y position of the electron [cm]", "y"), np.float32),
diff --git a/fuse/plugins/detector_physics/s1_photon_propagation.py b/fuse/plugins/detector_physics/s1_photon_propagation.py
index b930b462..62f26a5a 100644
--- a/fuse/plugins/detector_physics/s1_photon_propagation.py
+++ b/fuse/plugins/detector_physics/s1_photon_propagation.py
@@ -32,11 +32,11 @@ class S1PhotonPropagationBase(FuseBasePlugin):
     Note: The timing calculation is defined in the child plugin.
     """
 
-    __version__ = "0.3.0"
+    __version__ = "0.3.1"
 
-    depends_on = ("s1_photons", "microphysics_summary")
+    depends_on = ("microphysics_summary", "s1_photons")
     provides = "propagated_s1_photons"
-    data_kind = "S1_photons"
+    data_kind = "s1_photons"
 
     save_when = strax.SaveWhen.TARGET
 
diff --git a/fuse/plugins/detector_physics/s2_photon_propagation.py b/fuse/plugins/detector_physics/s2_photon_propagation.py
index 4b9cef4d..66b11916 100644
--- a/fuse/plugins/detector_physics/s2_photon_propagation.py
+++ b/fuse/plugins/detector_physics/s2_photon_propagation.py
@@ -32,18 +32,18 @@ class S2PhotonPropagationBase(FuseBaseDownChunkingPlugin):
     Note: The timing calculation is defined in the child plugin.
     """
 
-    __version__ = "0.3.2"
+    __version__ = "0.3.3"
 
     depends_on = (
-        "electron_time",
-        "s2_photons",
+        "microphysics_summary",
         "extracted_electrons",
         "drifted_electrons",
         "s2_photons_sum",
-        "microphysics_summary",
+        "electron_time",
+        "s2_photons",
     )
     provides = "propagated_s2_photons"
-    data_kind = "S2_photons"
+    data_kind = "s2_photons"
 
     save_when = strax.SaveWhen.TARGET
 
@@ -318,7 +318,7 @@ def rz_map(z, xy, **kwargs):
 
             self.field_dependencies_map = rz_map
 
-    def compute(self, individual_electrons, interactions_in_roi, start, end):
+    def compute(self, interactions_in_roi, individual_electrons, start, end):
         # Just apply this to clusters with photons
         mask = interactions_in_roi["n_electron_extracted"] > 0
 
@@ -689,14 +689,14 @@ class S2PhotonPropagationSimple(S2PhotonPropagationBase):
         default="take://resource://SIMULATION_CONFIG_FILE.json?&fmt=json&take=pressure",
         type=(int, float),
         cache=True,
-        help="pressure",
+        help="Pressure of liquid xenon [bar/e], while e is the elementary charge",
     )
 
     temperature = straxen.URLConfig(
         default="take://resource://SIMULATION_CONFIG_FILE.json?&fmt=json&take=temperature",
         type=(int, float),
         cache=True,
-        help="temperature",
+        help="Temperature of liquid xenon [K]",
     )
 
     gas_drift_velocity_slope = straxen.URLConfig(
@@ -759,14 +759,14 @@ class S2PhotonPropagationSimple(S2PhotonPropagationBase):
         "&take=gate_to_anode_distance",
         type=(int, float),
         cache=True,
-        help="gate_to_anode_distance",
+        help="Top of gate to bottom of anode (not considering perpendicular wires) [cm]",
     )
 
     anode_voltage = straxen.URLConfig(
         default="take://resource://SIMULATION_CONFIG_FILE.json?&fmt=json&take=anode_voltage",
         type=(int, float),
         cache=True,
-        help="anode_voltage",
+        help="Voltage of anode [V]",
     )
 
     lxe_dielectric_constant = straxen.URLConfig(
diff --git a/fuse/plugins/detector_physics/secondary_scintillation.py b/fuse/plugins/detector_physics/secondary_scintillation.py
index cb970945..a8811195 100644
--- a/fuse/plugins/detector_physics/secondary_scintillation.py
+++ b/fuse/plugins/detector_physics/secondary_scintillation.py
@@ -25,10 +25,10 @@ class SecondaryScintillation(FuseBasePlugin):
     result_name_photons_sum = "s2_photons_sum"
 
     depends_on = (
+        "microphysics_summary",
         "drifted_electrons",
         "extracted_electrons",
         "electron_time",
-        "microphysics_summary",
     )
     provides = (result_name_photons, result_name_photons_sum)
     data_kind = {
diff --git a/fuse/plugins/micro_physics/detector_volumes.py b/fuse/plugins/micro_physics/detector_volumes.py
index 3cddd71f..18125376 100644
--- a/fuse/plugins/micro_physics/detector_volumes.py
+++ b/fuse/plugins/micro_physics/detector_volumes.py
@@ -41,7 +41,7 @@ class XENONnT_TPC(VolumePlugin):
 
     provides = "tpc_interactions"
     data_kind = "tpc_interactions"
-    __version__ = "0.3.0"
+    __version__ = "0.3.1"
 
     # Can we import this from MergeCluster and just add the needed fields?
     dtype = [
@@ -57,9 +57,9 @@ class XENONnT_TPC(VolumePlugin):
         (("y position of the primary particle [cm]", "y_pri"), np.float32),
         (("z position of the primary particle [cm]", "z_pri"), np.float32),
         (("ID of the cluster", "cluster_id"), np.int32),
-        (("Xenon density at the cluster position.", "xe_density"), np.float32),
-        (("ID of the volume in which the cluster occured.", "vol_id"), np.int8),
-        (("Flag indicating if a cluster can create a S2 signal.", "create_S2"), np.bool_),
+        (("Xenon density at the cluster position", "xe_density"), np.float32),
+        (("ID of the volume in which the cluster occured", "vol_id"), np.int8),
+        (("Flag indicating if a cluster can create a S2 signal", "create_S2"), np.bool_),
     ]
 
     dtype = dtype + strax.time_fields
@@ -126,7 +126,7 @@ class XENONnT_BelowCathode(VolumePlugin):
 
     provides = "below_cathode_interactions"
     data_kind = "below_cathode_interactions"
-    __version__ = "0.3.0"
+    __version__ = "0.3.1"
 
     # Can we import this from MergeCluster and just add the needed fields?
     dtype = [
@@ -142,9 +142,9 @@ class XENONnT_BelowCathode(VolumePlugin):
         (("y position of the primary particle [cm]", "y_pri"), np.float32),
         (("z position of the primary particle [cm]", "z_pri"), np.float32),
         (("ID of the cluster", "cluster_id"), np.int32),
-        (("Xenon density at the cluster position.", "xe_density"), np.float32),
-        (("ID of the volume in which the cluster occured.", "vol_id"), np.int8),
-        (("Flag indicating if a cluster can create a S2 signal.", "create_S2"), np.bool_),
+        (("Xenon density at the cluster position", "xe_density"), np.float32),
+        (("ID of the volume in which the cluster occured", "vol_id"), np.int8),
+        (("Flag indicating if a cluster can create a S2 signal", "create_S2"), np.bool_),
     ]
 
     dtype = dtype + strax.time_fields
@@ -209,7 +209,7 @@ class XENONnT_GasPhase(VolumePlugin):
 
     provides = "gas_phase_interactions"
     data_kind = "gas_phase_interactions"
-    __version__ = "0.3.0"
+    __version__ = "0.3.1"
 
     # Can we import this from MergeCluster and just add the needed fields?
     dtype = [
@@ -225,9 +225,9 @@ class XENONnT_GasPhase(VolumePlugin):
         (("y position of the primary particle [cm]", "y_pri"), np.float32),
         (("z position of the primary particle [cm]", "z_pri"), np.float32),
         (("ID of the cluster", "cluster_id"), np.int32),
-        (("Xenon density at the cluster position.", "xe_density"), np.float32),
-        (("ID of the volume in which the cluster occured.", "vol_id"), np.int8),
-        (("Flag indicating if a cluster can create a S2 signal.", "create_S2"), np.bool_),
+        (("Xenon density at the cluster position", "xe_density"), np.float32),
+        (("ID of the volume in which the cluster occured", "vol_id"), np.int8),
+        (("Flag indicating if a cluster can create a S2 signal", "create_S2"), np.bool_),
     ]
 
     dtype = dtype + strax.time_fields
@@ -237,31 +237,31 @@ class XENONnT_GasPhase(VolumePlugin):
     xenonnt_z_top_pmts = straxen.URLConfig(
         default=7.3936,  # cm
         type=(int, float),
-        help="xenonnt_z_top_pmts",
+        help="Position of the top of gas phase [cm]",
     )
 
     xenonnt_z_lxe = straxen.URLConfig(
         default=0.416,  # cm ... liquid-gas interface
         type=(int, float),
-        help="xenonnt_z_lxe",
+        help="Position of the bottom of gas phase [cm]",
     )
 
     xenonnt_sensitive_volume_radius = straxen.URLConfig(
         default=66.4,  # cm
         type=(int, float),
-        help="xenonnt_sensitive_volume_radius",
+        help="Radius of the XENONnT TPC [cm]",
     )
 
     xenon_density_gas_phase = straxen.URLConfig(
         default=0.0177,
         type=(int, float),
-        help="xenon_density",
+        help="Density of XENON in the gas phase [g/cm3]",
     )
 
     create_S2_xenonnt_gas_phase = straxen.URLConfig(
         default=False,
         type=bool,
-        help="No S2s in gas",
+        help="Whether generate S2s in gas phase",
     )
 
     def compute(self, clustered_interactions):
diff --git a/fuse/plugins/micro_physics/electric_field.py b/fuse/plugins/micro_physics/electric_field.py
index f81a5a6e..3f223270 100644
--- a/fuse/plugins/micro_physics/electric_field.py
+++ b/fuse/plugins/micro_physics/electric_field.py
@@ -18,7 +18,7 @@ class ElectricField(FuseBasePlugin):
 
     __version__ = "0.2.2"
 
-    depends_on = ("interactions_in_roi",)
+    depends_on = "interactions_in_roi"
     provides = "electric_field_values"
     data_kind = "interactions_in_roi"
 
diff --git a/fuse/plugins/micro_physics/input.py b/fuse/plugins/micro_physics/input.py
index c18e89c0..276e885a 100644
--- a/fuse/plugins/micro_physics/input.py
+++ b/fuse/plugins/micro_physics/input.py
@@ -27,7 +27,7 @@ class ChunkInput(FuseBasePlugin):
     and will create multiple chunks of data if needed.
     """
 
-    __version__ = "0.3.1"
+    __version__ = "0.3.2"
 
     depends_on: Tuple = tuple()
     provides = "geant4_interactions"
@@ -47,9 +47,9 @@ class ChunkInput(FuseBasePlugin):
         (("Geant4 process creating the particle", "creaproc"), "<U25"),
         (("Geant4 process responsible for the energy deposit", "edproc"), "<U25"),
         (("Geant4 event ID", "evtid"), np.int32),
-        (("x position of the primary particle", "x_pri"), np.float32),
-        (("y position of the primary particle", "y_pri"), np.float32),
-        (("z position of the primary particle", "z_pri"), np.float32),
+        (("x position of the primary particle [cm]", "x_pri"), np.float32),
+        (("y position of the primary particle [cm]", "y_pri"), np.float32),
+        (("z position of the primary particle [cm]", "z_pri"), np.float32),
     ]
 
     dtype = dtype + strax.time_fields
@@ -86,7 +86,7 @@ class ChunkInput(FuseBasePlugin):
     cut_delayed = straxen.URLConfig(
         default=9e18,
         type=(int, float),
-        help="All interactions happening after this time (including the event time) will be cut.",
+        help="All interactions happening after this time (including the event time) will be cut",
     )
 
     n_interactions_per_chunk = straxen.URLConfig(
@@ -98,12 +98,12 @@ class ChunkInput(FuseBasePlugin):
     entry_start = straxen.URLConfig(
         default=0,
         type=(int, float),
-        help="Geant4 event to start simulation from.",
+        help="Geant4 event to start simulation from",
     )
 
     entry_stop = straxen.URLConfig(
         default=None,
-        help="Geant4 event to stop simulation at. If None, all events are simulated.",
+        help="Geant4 event to stop simulation at. If None, all events are simulated",
     )
 
     cut_by_eventid = straxen.URLConfig(
diff --git a/fuse/plugins/micro_physics/merge_cluster.py b/fuse/plugins/micro_physics/merge_cluster.py
index f09eaeef..18864203 100644
--- a/fuse/plugins/micro_physics/merge_cluster.py
+++ b/fuse/plugins/micro_physics/merge_cluster.py
@@ -25,7 +25,7 @@ class MergeCluster(FuseBasePlugin):
     interaction.
     """
 
-    __version__ = "0.3.0"
+    __version__ = "0.3.1"
 
     depends_on = ("geant4_interactions", "cluster_index")
 
@@ -47,11 +47,11 @@ class MergeCluster(FuseBasePlugin):
         (("y position of the primary particle [cm]", "y_pri"), np.float32),
         (("z position of the primary particle [cm]", "z_pri"), np.float32),
         (("ID of the cluster", "cluster_id"), np.int32),
-        (("Xenon density at the cluster position. Will be set later.", "xe_density"), np.float32),
-        (("ID of the volume in which the cluster occured. Will be set later.", "vol_id"), np.int8),
+        (("Xenon density at the cluster position. Will be set later", "xe_density"), np.float32),
+        (("ID of the volume in which the cluster occured. Will be set later", "vol_id"), np.int8),
         (
             (
-                "Flag indicating if a cluster can create a S2 signal. Will be set later.",
+                "Flag indicating if a cluster can create a S2 signal. Will be set later",
                 "create_S2",
             ),
             np.bool_,
@@ -65,7 +65,7 @@ class MergeCluster(FuseBasePlugin):
         default="take://resource://SIMULATION_CONFIG_FILE.json?fmt=json&take=tag_cluster_by",
         cache=True,
         help="Decide if you tag the cluster "
-        "according to first interaction (time) or most energetic (energy) one.",
+        "according to first interaction (time) or most energetic (energy) one",
     )
 
     def compute(self, geant4_interactions):
diff --git a/fuse/plugins/micro_physics/microphysics_summary.py b/fuse/plugins/micro_physics/microphysics_summary.py
index 6a4435ca..10ae617d 100644
--- a/fuse/plugins/micro_physics/microphysics_summary.py
+++ b/fuse/plugins/micro_physics/microphysics_summary.py
@@ -8,11 +8,11 @@ class MicroPhysicsSummary(strax.MergeOnlyPlugin):
     """MergeOnlyPlugin that summarizes the fuse microphysics simulation results
     into a single output."""
 
-    depends_on = [
+    depends_on = (
         "interactions_in_roi",
         "quanta",
         "electric_field_values",
-    ]
+    )
     rechunk_on_save = False
     save_when = strax.SaveWhen.ALWAYS
     provides = "microphysics_summary"
diff --git a/fuse/plugins/micro_physics/wfsim_connection.py b/fuse/plugins/micro_physics/wfsim_connection.py
index 16dcaa79..6967fbf6 100644
--- a/fuse/plugins/micro_physics/wfsim_connection.py
+++ b/fuse/plugins/micro_physics/wfsim_connection.py
@@ -18,9 +18,9 @@
 
 @export
 class output_plugin(FuseBasePlugin):
-    __version__ = "0.2.0"
+    __version__ = "0.2.1"
 
-    depends_on = ["interactions_in_roi", "quanta", "electric_field_values"]  # Add times later
+    depends_on = ("interactions_in_roi", "quanta", "electric_field_values")  # Add times later
 
     provides = "wfsim_instructions"
     data_kind = "wfsim_instructions"
@@ -28,7 +28,7 @@ class output_plugin(FuseBasePlugin):
     save_when = strax.SaveWhen.TARGET
 
     dtype = [
-        (("Waveform simulator event number.", "event_number"), np.int32),
+        (("Waveform simulator event number", "event_number"), np.int32),
         (("Quanta type (S1 photons or S2 electrons)", "type"), np.int8),
         (("Time of the interaction [ns]", "time"), np.int64),
         (("End Time of the interaction [ns]", "endtime"), np.int64),
@@ -36,7 +36,7 @@ class output_plugin(FuseBasePlugin):
         (("Y position of the cluster [cm]", "y"), np.float32),
         (("Z position of the cluster [cm]", "z"), np.float32),
         (("Number of quanta", "amp"), np.int32),
-        (("Recoil type of interaction.", "recoil"), np.int8),
+        (("Recoil type of interaction", "recoil"), np.int8),
         (("Energy deposit of interaction", "e_dep"), np.float32),
         (("Eventid like in geant4 output rootfile", "g4id"), np.int32),
         (("Volume id giving the detector subvolume", "vol_id"), np.int32),
diff --git a/fuse/plugins/micro_physics/yields.py b/fuse/plugins/micro_physics/yields.py
index 90d3687c..b2976888 100644
--- a/fuse/plugins/micro_physics/yields.py
+++ b/fuse/plugins/micro_physics/yields.py
@@ -22,16 +22,16 @@ class NestYields(FuseBasePlugin):
     """Plugin that calculates the number of photons, electrons and excitons
     produced by energy deposit using nestpy."""
 
-    __version__ = "0.2.0"
+    __version__ = "0.2.1"
 
-    depends_on = ["interactions_in_roi", "electric_field_values"]
+    depends_on = ("interactions_in_roi", "electric_field_values")
     provides = "quanta"
     data_kind = "interactions_in_roi"
 
     dtype = [
-        (("Number of photons at interaction position.", "photons"), np.int32),
-        (("Number of electrons at interaction position.", "electrons"), np.int32),
-        (("Number of excitons at interaction position.", "excitons"), np.int32),
+        (("Number of photons at interaction position", "photons"), np.int32),
+        (("Number of electrons at interaction position", "electrons"), np.int32),
+        (("Number of excitons at interaction position", "excitons"), np.int32),
     ]
 
     dtype = dtype + strax.time_fields
@@ -170,7 +170,7 @@ def _quanta_from_NEST(en, model, e_field, A, Z, create_s2, **kwargs):
 class BetaYields(strax.Plugin):
     __version__ = "0.1.1"
 
-    depends_on = ["interactions_in_roi", "electric_field_values"]
+    depends_on = ("interactions_in_roi", "electric_field_values")
     provides = "quanta"
     data_kind = "interactions_in_roi"
 
@@ -219,7 +219,7 @@ class BetaYields(strax.Plugin):
     deterministic_seed = straxen.URLConfig(
         default=True,
         type=bool,
-        help="Set the random seed from lineage and run_id, or pull the seed from the OS.",
+        help="Set the random seed from lineage and run_id, or pull the seed from the OS",
     )
 
     def setup(self):
@@ -308,7 +308,7 @@ def get_quanta(self, energy, field):
 class BBFYields(FuseBasePlugin):
     __version__ = "0.1.1"
 
-    depends_on = ["interactions_in_roi", "electric_field_values"]
+    depends_on = ("interactions_in_roi", "electric_field_values")
     provides = "quanta"
 
     dtype = [
diff --git a/fuse/plugins/pmt_and_daq/pmt_afterpulses.py b/fuse/plugins/pmt_and_daq/pmt_afterpulses.py
index 4affb54b..9b52f89c 100644
--- a/fuse/plugins/pmt_and_daq/pmt_afterpulses.py
+++ b/fuse/plugins/pmt_and_daq/pmt_afterpulses.py
@@ -26,7 +26,7 @@ class PMTAfterPulses(FuseBasePlugin):
 
     depends_on = ("propagated_s2_photons", "propagated_s1_photons")
     provides = "pmt_afterpulses"
-    data_kind = "AP_photons"
+    data_kind = "ap_photons"
 
     save_when = strax.SaveWhen.TARGET
 
@@ -123,13 +123,13 @@ def setup(self):
                 if isinstance(self.uniform_to_pmt_ap[k][q], list):
                     self.uniform_to_pmt_ap[k][q] = np.array(self.uniform_to_pmt_ap[k][q])
 
-    def compute(self, S1_photons, S2_photons):
-        if not self.enable_pmt_afterpulses or (len(S1_photons) == 0 and len(S2_photons) == 0):
+    def compute(self, s1_photons, s2_photons):
+        if not self.enable_pmt_afterpulses or (len(s1_photons) == 0 and len(s2_photons) == 0):
             return np.zeros(0, dtype=self.dtype)
 
-        merged_photons = np.concatenate([S1_photons, S2_photons])
-        S1_photons = None
-        S2_photons = None
+        merged_photons = np.concatenate([s1_photons, s2_photons])
+        s1_photons = None
+        s2_photons = None
 
         # Sort all photons by time
         sortind = np.argsort(merged_photons["time"])
diff --git a/fuse/plugins/truth_information/cluster_tagging.py b/fuse/plugins/truth_information/cluster_tagging.py
index 668c4318..af873b96 100644
--- a/fuse/plugins/truth_information/cluster_tagging.py
+++ b/fuse/plugins/truth_information/cluster_tagging.py
@@ -9,9 +9,9 @@ class ClusterTagging(strax.Plugin):
     """Plugin to tag if clusters contribute to the main or alternative
     s1/s2."""
 
-    __version__ = "0.0.2"
+    __version__ = "0.0.3"
 
-    depends_on = ("peak_basics", "microphysics_summary", "event_basics", "photon_summary")
+    depends_on = ("microphysics_summary", "photon_summary", "peak_basics", "event_basics")
     provides = "tagged_clusters"
     data_kind = "interactions_in_roi"
 
@@ -27,7 +27,7 @@ class ClusterTagging(strax.Plugin):
     ]
     dtype = dtype + strax.time_fields
 
-    def compute(self, peaks, interactions_in_roi, events, propagated_photons):
+    def compute(self, interactions_in_roi, propagated_photons, peaks, events):
         peaks_in_event = strax.split_by_containment(peaks, events)
         photon_in_event = strax.split_touching_windows(propagated_photons, events)
 
diff --git a/fuse/plugins/truth_information/event_truth.py b/fuse/plugins/truth_information/event_truth.py
index f89a50b8..1ed88f1b 100644
--- a/fuse/plugins/truth_information/event_truth.py
+++ b/fuse/plugins/truth_information/event_truth.py
@@ -6,9 +6,9 @@
 
 @export
 class EventTruth(strax.Plugin):
-    __version__ = "0.0.2"
+    __version__ = "0.0.3"
 
-    depends_on = ("peak_truth", "microphysics_summary", "event_basics", "photon_summary")
+    depends_on = ("microphysics_summary", "photon_summary", "peak_truth", "event_basics")
     provides = "event_truth"
     data_kind = "events"
 
@@ -21,7 +21,7 @@ class EventTruth(strax.Plugin):
     ]
     dtype = dtype + strax.time_fields
 
-    def compute(self, peaks, propagated_photons, interactions_in_roi, events):
+    def compute(self, interactions_in_roi, propagated_photons, peaks, events):
         peaks_in_event = strax.split_by_containment(peaks, events)
         photons_per_event = strax.split_by_containment(propagated_photons, events)
 
diff --git a/fuse/plugins/truth_information/peak_truth.py b/fuse/plugins/truth_information/peak_truth.py
index 0ea0dcfb..bb772435 100644
--- a/fuse/plugins/truth_information/peak_truth.py
+++ b/fuse/plugins/truth_information/peak_truth.py
@@ -9,15 +9,15 @@
 
 @export
 class PeakTruth(strax.OverlapWindowPlugin):
-    __version__ = "0.0.4"
+    __version__ = "0.0.5"
 
     depends_on = (
-        "photon_summary",
-        "peak_basics",
         "microphysics_summary",
         "s1_photons",
-        "s2_photons_sum",
         "drifted_electrons",
+        "s2_photons_sum",
+        "photon_summary",
+        "peak_basics",
     )
     provides = "peak_truth"
     data_kind = "peaks"
diff --git a/fuse/plugins/truth_information/records_truth.py b/fuse/plugins/truth_information/records_truth.py
index 2f57debd..d100ef52 100644
--- a/fuse/plugins/truth_information/records_truth.py
+++ b/fuse/plugins/truth_information/records_truth.py
@@ -12,9 +12,9 @@
 class RecordsTruth(strax.Plugin):
     """Plugin that computes the truth information for raw_records."""
 
-    __version__ = "0.0.1"
+    __version__ = "0.0.2"
 
-    depends_on = ("raw_records", "photon_summary")
+    depends_on = ("photon_summary", "raw_records")
     provides = "records_truth"
 
     dtype = [
@@ -67,7 +67,7 @@ def setup(self):
             pmt_circuit_load_resistor=self.pmt_circuit_load_resistor,
         )
 
-    def compute(self, raw_records, propagated_photons):
+    def compute(self, propagated_photons, raw_records):
         result = np.zeros(len(raw_records), dtype=self.dtype)
         result["time"] = raw_records["time"]
         result["length"] = raw_records["length"]
diff --git a/fuse/plugins/truth_information/surviving_clusters.py b/fuse/plugins/truth_information/surviving_clusters.py
index 6f961f34..526f7352 100644
--- a/fuse/plugins/truth_information/surviving_clusters.py
+++ b/fuse/plugins/truth_information/surviving_clusters.py
@@ -6,10 +6,11 @@
 
 @export
 class SurvivingClusters(strax.Plugin):
-    __version__ = "0.0.2"
+    __version__ = "0.0.3"
 
-    depends_on = ("peak_basics", "photon_summary", "microphysics_summary")
+    depends_on = ("microphysics_summary", "photon_summary", "peak_basics")
     provides = "surviving_clusters"
+    data_kind = "interactions_in_roi"
 
     dtype = [
         ("creating_a_photon", np.bool_),
@@ -17,9 +18,7 @@ class SurvivingClusters(strax.Plugin):
     ]
     dtype += strax.time_fields
 
-    data_kind = "interactions_in_roi"
-
-    def compute(self, peaks, propagated_photons, interactions_in_roi):
+    def compute(self, interactions_in_roi, propagated_photons, peaks):
         # Check if the cluster contributes to any cluster
         cluster_creating_a_photon = np.isin(
             interactions_in_roi["cluster_id"], np.unique(propagated_photons["cluster_id"])