diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp
index 2a95aea6de..a8bfba0c89 100644
--- a/firmware/controllers/algo/advance_map.cpp
+++ b/firmware/controllers/algo/advance_map.cpp
@@ -175,7 +175,7 @@ angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "_AngleN4", 0);
 	angle -= engineConfiguration->ignitionOffset;
 	efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "_AngleN5", 0);
-	fixAngle(angle, "getAdvance", CUSTOM_ERR_6548);
+	fixAngle(angle, "getAdvance", CUSTOM_ERR_ADCANCE_CALC_ANGLE);
 	return angle;
 }
 
diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h
index e6d32e2c03..23dcf229cf 100644
--- a/firmware/controllers/algo/obd_error_codes.h
+++ b/firmware/controllers/algo/obd_error_codes.h
@@ -1704,7 +1704,7 @@ typedef enum {
 	CUSTOM_OBD_26 = 6026,
 	CUSTOM_UNEXPECTED_ENGINE_TYPE = 6027,
 	CUSTOM_INVALID_TPS_SETTING = 6028,
-	CUSTOM_RE_ADDING = 6029,
+	CUSTOM_RE_ADDING_INTO_EXECUTION_QUEUE = 6029,
 
 	CUSTOM_OBD_NAN_INJECTION = 6030,
 	CUSTOM_OBD_NEG_INJECTION = 6031,
@@ -1852,7 +1852,7 @@ typedef enum {
 	CUSTOM_ERR_OUT_OF_ORDER = 6147,
 	CUSTOM_ERR_T2_CHARGE = 6148,
 	/**
-	 * This indicates an issue with coil control
+	 * This indicates an issue with coil control - pin was not high when we were trying to set it low.
 	 */
 	CUSTOM_OUT_OF_ORDER_COIL = 6149,
 
@@ -1903,9 +1903,9 @@ typedef enum {
 	CUSTOM_ADD_BASE = 6543,
 	CUSTOM_ERR_6544 = 6544,
 	CUSTOM_ERR_6545 = 6545,
-	CUSTOM_ERR_6546 = 6546,
-	CUSTOM_ERR_6547 = 6547,
-	CUSTOM_ERR_6548 = 6548,
+	CUSTOM_UNEXPECTED_TDC_ANGLE = 6546,
+	CUSTOM_INVALID_GLOBAL_OFFSET = 6547,
+	CUSTOM_UNEXPECTED_MAP_VALUE = 6548,
 	CUSTOM_ERR_6549 = 6549,
 
 	CUSTOM_ERR_6550 = 6550,
@@ -2036,7 +2036,7 @@ typedef enum {
 	CUSTOM_ERR_6664 = 6664,
 	CUSTOM_ERR_6665 = 6665,
 	CUSTOM_ERR_6666 = 6666,
-	CUSTOM_ERR_6667 = 6667,
+	CUSTOM_ERR_ADCANCE_CALC_ANGLE = 6667,
 	CUSTOM_ERR_6668 = 6668,
 	CUSTOM_ERR_6669 = 6669,
 
diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp
index 85d86d1ce7..f20834be08 100644
--- a/firmware/controllers/map_averaging.cpp
+++ b/firmware/controllers/map_averaging.cpp
@@ -194,7 +194,7 @@ static void endAveraging(void *arg) {
 		}
 		currentPressure = minPressure;
 	} else {
-		warning(CUSTOM_ERR_6548, "No MAP values");
+		warning(CUSTOM_UNEXPECTED_MAP_VALUE, "No MAP values");
 	}
 #endif
 	if (!wasLocked)
diff --git a/firmware/controllers/system/event_queue.h b/firmware/controllers/system/event_queue.h
index 32c6161f37..bcc9ee463c 100644
--- a/firmware/controllers/system/event_queue.h
+++ b/firmware/controllers/system/event_queue.h
@@ -35,7 +35,7 @@ bool assertNotInList(T *head, T*element) {
 			 * was not scheduled by angle but was scheduled by time. In case of scheduling
 			 * by time with slow RPM the whole next fast revolution might be within the wait period
 			 */
-			warning(CUSTOM_RE_ADDING, "re-adding element into event_queue");
+			warning(CUSTOM_RE_ADDING_INTO_EXECUTION_QUEUE, "re-adding element into event_queue");
 			return true;
 		}
 	}
diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp
index 68bb71d5a2..b325d956cc 100644
--- a/firmware/controllers/trigger/decoders/trigger_structure.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp
@@ -345,10 +345,10 @@ void TriggerShape::findTriggerPosition(event_trigger_position_s *position,
 	assertAngleRange(angleOffset, "findAngle#a1", CUSTOM_ERR_6545);
 
 	efiAssertVoid(CUSTOM_ERR_6575, !cisnan(tdcPosition), "tdcPos#1")
-	assertAngleRange(tdcPosition, "tdcPos#a1", CUSTOM_ERR_6546);
+	assertAngleRange(tdcPosition, "tdcPos#a1", CUSTOM_UNEXPECTED_TDC_ANGLE);
 
 	efiAssertVoid(CUSTOM_ERR_6576, !cisnan(CONFIG_PARAM(globalTriggerAngleOffset)), "tdcPos#2")
-	assertAngleRange(CONFIG_PARAM(globalTriggerAngleOffset), "tdcPos#a2", CUSTOM_ERR_6547);
+	assertAngleRange(CONFIG_PARAM(globalTriggerAngleOffset), "tdcPos#a2", CUSTOM_INVALID_GLOBAL_OFFSET);
 
 	// convert engine cycle angle into trigger cycle angle
 	angleOffset += tdcPosition + CONFIG_PARAM(globalTriggerAngleOffset);
diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/trigger/spark_logic.cpp
index 3df5db90d0..b44abdd4f3 100644
--- a/firmware/controllers/trigger/spark_logic.cpp
+++ b/firmware/controllers/trigger/spark_logic.cpp
@@ -41,7 +41,6 @@ static void turnSparkPinLow2(IgnitionEvent *event, IgnitionOutputPin *output) {
 	 * 1) low goes before high, everything is fine after words
 	 *
 	 * 2) we have an un-matched low followed by legit pairs
-	 *
 	 */
 
 	output->signalFallSparkId = event->sparkId;