diff --git a/src/xrt/compositor/client/comp_gl_client.h b/src/xrt/compositor/client/comp_gl_client.h
index 5f91856ad..e8a25fce8 100644
--- a/src/xrt/compositor/client/comp_gl_client.h
+++ b/src/xrt/compositor/client/comp_gl_client.h
@@ -45,7 +45,7 @@ struct client_gl_swapchain
 	uint32_t tex_target;
 
 	/*!
-	 * The compositor this swapchain was created on. Used when swapchain functions need access to the GL context.
+	 * The compositor this swapchain was created on. Used when swapchain functions need to use the GL context.
 	 *
 	 * Not an owning pointer.
 	 */
diff --git a/src/xrt/compositor/client/comp_gl_memobj_swapchain.h b/src/xrt/compositor/client/comp_gl_memobj_swapchain.h
index 71373b105..26017e81b 100644
--- a/src/xrt/compositor/client/comp_gl_memobj_swapchain.h
+++ b/src/xrt/compositor/client/comp_gl_memobj_swapchain.h
@@ -37,7 +37,7 @@ struct client_gl_memobj_swapchain
 
 /*!
  * Create a swapchain, belonging to a client_gl_compositor, that uses
- * GL_memory_object and related extensions to access the native buffer.
+ * GL_memory_object and related extensions to use the native buffer.
  *
  * This is most commonly used on desktop OpenGL.
  *
diff --git a/src/xrt/compositor/client/comp_gl_xlib_client.h b/src/xrt/compositor/client/comp_gl_xlib_client.h
index e1024ec72..f8b212a0f 100644
--- a/src/xrt/compositor/client/comp_gl_xlib_client.h
+++ b/src/xrt/compositor/client/comp_gl_xlib_client.h
@@ -38,7 +38,7 @@ struct client_gl_xlib_compositor
 
 	/*!
 	 * Temporary storage for "current" OpenGL context while app_context is
-	 * made current via context_begin/context_end. We only need one because
+	 * made current using context_begin/context_end. We only need one because
 	 * app_context can only be made current in one thread at a time too.
 	 */
 	struct client_gl_context temp_context;
diff --git a/src/xrt/compositor/main/comp_target_swapchain.c b/src/xrt/compositor/main/comp_target_swapchain.c
index c8a8b2170..0be02247f 100644
--- a/src/xrt/compositor/main/comp_target_swapchain.c
+++ b/src/xrt/compositor/main/comp_target_swapchain.c
@@ -30,7 +30,7 @@
  */
 
 /*!
- * These formats will be 'preferred' - in future we may wish to give preference
+ * These formats will be 'preferred' - we may wish to give preference
  * to higher bit depths if they are available, but most display devices we are
  * interested in should support one these.
  */
diff --git a/src/xrt/compositor/main/comp_window.h b/src/xrt/compositor/main/comp_window.h
index 60d3178db..55f4ebe57 100644
--- a/src/xrt/compositor/main/comp_window.h
+++ b/src/xrt/compositor/main/comp_window.h
@@ -48,7 +48,7 @@ struct comp_target *
 comp_window_wayland_create(struct comp_compositor *c);
 
 /*!
- * Create a direct surface to a HMD via Wayland.
+ * Create a direct surface to a HMD using Wayland.
  *
  * @ingroup comp
  */
diff --git a/src/xrt/compositor/main/comp_window_direct_wayland.c b/src/xrt/compositor/main/comp_window_direct_wayland.c
index d53c2ee94..c777f246c 100644
--- a/src/xrt/compositor/main/comp_window_direct_wayland.c
+++ b/src/xrt/compositor/main/comp_window_direct_wayland.c
@@ -143,7 +143,7 @@ _lease_finished(void *data, struct wp_drm_lease_v1 *wp_drm_lease_v1)
 		lease->leased_fd = -1;
 	}
 
-	COMP_DEBUG(lease->w->base.base.c, "Lease has been terminated");
+	COMP_DEBUG(lease->w->base.base.c, "Lease has been closed");
 	lease->finished = true;
 }
 
diff --git a/src/xrt/compositor/shaders/distortion.comp b/src/xrt/compositor/shaders/distortion.comp
index 4be6bbbdb..dce5532c9 100644
--- a/src/xrt/compositor/shaders/distortion.comp
+++ b/src/xrt/compositor/shaders/distortion.comp
@@ -43,7 +43,7 @@ vec2 position_to_uv(ivec2 extent, uint ix, uint iy)
 	dist_uv = dist_uv + extent_pixel_size / 2.0;
 
 
-	// In order to correctly sample we need to put position (0, 0) in the
+	// To correctly sample we need to put position (0, 0) in the
 	// middle of the (0, 0) texel in the distortion texures. That's why we
 	// offset with half the texel size, pushing all samples into the middle
 	// of each texels, a kin to a vertex buffer. We need to put uv coord
diff --git a/src/xrt/compositor/util/comp_vulkan.c b/src/xrt/compositor/util/comp_vulkan.c
index c1f515bdb..6d19e9d6a 100644
--- a/src/xrt/compositor/util/comp_vulkan.c
+++ b/src/xrt/compositor/util/comp_vulkan.c
@@ -135,7 +135,7 @@ fill_in_results(struct vk_bundle *vk, const struct comp_vulkan_arguments *vk_arg
 			char buffer[UUID_STR_SIZE] = {0};
 			snprint_uuid(buffer, ARRAY_SIZE(buffer), &vk_res->client_gpu_deviceUUID);
 
-			// Trailing space above, means 'to' should be right next to '%s'.
+			// Trailing space from snprint_uuid, means 'to' should be right next to '%s'.
 			VK_DEBUG(vk, "Suggest %d with uuid: %sto clients", vk_res->client_gpu_index, buffer);
 
 			if (get_device_luid(vk, vk_res->client_gpu_index, &vk_res->client_gpu_deviceLUID)) {