diff --git a/src/xrt/tracking/hand/mercury/hg_model.hpp b/src/xrt/tracking/hand/mercury/hg_model.hpp
index 850c77b64..c76322e87 100644
--- a/src/xrt/tracking/hand/mercury/hg_model.hpp
+++ b/src/xrt/tracking/hand/mercury/hg_model.hpp
@@ -141,8 +141,8 @@ normalizeGrayscaleImage(cv::Mat &data_in, cv::Mat &data_out)
 
 	data_out *= 0.25 / stddev.at<double>(0, 0);
 
-	// Calculate it again; mean has changed. Yes we odn't need to but it's easy
-	//!@optimize
+	// Calculate it again; mean has changed. Yes we don't need to but it's easy
+	//! @todo optimize
 	cv::meanStdDev(data_out, mean, stddev);
 	data_out += (0.5 - mean.at<double>(0, 0));
 }
diff --git a/src/xrt/tracking/hand/mercury/kine/kinematic_main.cpp b/src/xrt/tracking/hand/mercury/kine/kinematic_main.cpp
index a1f47cfa3..896275d7a 100644
--- a/src/xrt/tracking/hand/mercury/kine/kinematic_main.cpp
+++ b/src/xrt/tracking/hand/mercury/kine/kinematic_main.cpp
@@ -177,7 +177,7 @@ clamp_to_x_axis(struct kinematic_hand_4f *hand,
 	// std::cout << bone->bone_relation.linear() * Eigen::Vector3f::UnitX() << "\n";
 
 	if (clamp_angle) {
-		//!@optimize: get rid of 1 and 2, we only need 0.
+		//! @todo optimize: get rid of 1 and 2, we only need 0.
 
 		// signed angle: asin(Cross product of -z and rot*-z X axis.
 		// U_LOG_E("before X clamp");
@@ -197,7 +197,7 @@ clamp_to_x_axis(struct kinematic_hand_4f *hand,
 
 
 
-		//!@optimize Move the asin into constexpr land
+		//! @todo optimize: Move the asin into constexpr land
 		// No, the sine of the joint limit
 		float rotation_value = asin(cross(0));
 
@@ -470,4 +470,4 @@ free_kinematic_hand(kinematic_hand_4f **kinematic_hand) {
 	delete *kinematic_hand;
 }
 
-} // namespace xrt::tracking::hand::mercury::kine
\ No newline at end of file
+} // namespace xrt::tracking::hand::mercury::kine
diff --git a/src/xrt/tracking/hand/mercury/kine/kinematic_tiny_math.hpp b/src/xrt/tracking/hand/mercury/kine/kinematic_tiny_math.hpp
index cb1144334..21f17d825 100644
--- a/src/xrt/tracking/hand/mercury/kine/kinematic_tiny_math.hpp
+++ b/src/xrt/tracking/hand/mercury/kine/kinematic_tiny_math.hpp
@@ -28,7 +28,7 @@ wct_to_quat(wct_t wct, struct xrt_quat *out)
 	xrt_quat just_twist;
 	math_quat_from_angle_vector(wct.twist, &twist_axis, &just_twist);
 
-	//!@optimize This should be a matrix multiplication...
+	//! @todo: optimize This should be a matrix multiplication...
 	*out = just_waggle;
 	math_quat_rotate(out, &just_curl, out);
 	math_quat_rotate(out, &just_twist, out);
@@ -52,4 +52,4 @@ clamp_to_r(float *in, float c, float r)
 {
 	clamp(in, c - r, c + r);
 }
-} // namespace xrt::tracking::hand::mercury::kine
\ No newline at end of file
+} // namespace xrt::tracking::hand::mercury::kine