diff --git a/mcp/pom.xml b/mcp/pom.xml
index f6e93b39c..edb1c8f07 100644
--- a/mcp/pom.xml
+++ b/mcp/pom.xml
@@ -97,7 +97,7 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- The Spring Context is required due to the reactor-netty connector being dependant on
+		<!-- The Spring Context is required due to the reactor-netty connector being dependent on
 		the Spring Lifecycle, as discussed here:
 		https://github.com/spring-projects/spring-framework/issues/31180 -->
 		<dependency>
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java b/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
index 379b47e23..ce49b0a5e 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java
@@ -364,7 +364,7 @@ private <T> Mono<T> withInitializationCheck(String actionName,
 	}
 
 	// --------------------------
-	// Basic Utilites
+	// Basic Utilities
 	// --------------------------
 
 	/**
@@ -751,6 +751,14 @@ private NotificationHandler asyncPromptsChangeNotificationHandler(
 	// --------------------------
 	// Logging
 	// --------------------------
+	/**
+	 * Create a notification handler for logging notifications from the server. This
+	 * handler automatically distributes logging messages to all registered consumers.
+	 * @param loggingConsumers List of consumers that will be notified when a logging
+	 * message is received. Each consumer receives the logging message notification.
+	 * @return A NotificationHandler that processes log notifications by distributing the
+	 * message to all registered consumers
+	 */
 	private NotificationHandler asyncLoggingNotificationHandler(
 			List<Function<LoggingMessageNotification, Mono<Void>>> loggingConsumers) {
 
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java b/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java
index 696efdffd..914bc263a 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java
@@ -343,7 +343,7 @@ public Mono<Void> closeGracefully() {
 	}
 
 	/**
-	 * Unmarshals data to the specified type using the configured object mapper.
+	 * Unmarshal data to the specified type using the configured object mapper.
 	 * @param data the data to unmarshal
 	 * @param typeRef the type reference for the target type
 	 * @param <T> the target type
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java b/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
index f9a97849f..9d71cbb48 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
@@ -292,7 +292,7 @@ private void startInboundProcessing() {
 	 */
 	private void startOutboundProcessing() {
 		this.handleOutbound(messages -> messages
-			// this bit is important since writes come from user threads and we
+			// this bit is important since writes come from user threads, and we
 			// want to ensure that the actual writing happens on a dedicated thread
 			.publishOn(outboundScheduler)
 			.handle((message, s) -> {
diff --git a/mcp/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java b/mcp/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java
index e29646e6a..719a78001 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java
@@ -107,7 +107,7 @@ public interface NotificationHandler {
 	public McpClientSession(Duration requestTimeout, McpClientTransport transport,
 			Map<String, RequestHandler<?>> requestHandlers, Map<String, NotificationHandler> notificationHandlers) {
 
-		Assert.notNull(requestTimeout, "The requstTimeout can not be null");
+		Assert.notNull(requestTimeout, "The requestTimeout can not be null");
 		Assert.notNull(transport, "The transport can not be null");
 		Assert.notNull(requestHandlers, "The requestHandlers can not be null");
 		Assert.notNull(notificationHandlers, "The notificationHandlers can not be null");
@@ -127,7 +127,7 @@ public McpClientSession(Duration requestTimeout, McpClientTransport transport,
 				logger.debug("Received Response: {}", response);
 				var sink = pendingResponses.remove(response.id());
 				if (sink == null) {
-					logger.warn("Unexpected response for unkown id {}", response.id());
+					logger.warn("Unexpected response for unknown id {}", response.id());
 				}
 				else {
 					sink.success(response);