diff --git a/Core/HTTPResponse.h b/Core/HTTPResponse.h
index f303cf30..e6e16d5e 100644
--- a/Core/HTTPResponse.h
+++ b/Core/HTTPResponse.h
@@ -96,7 +96,7 @@
  * each chunk.  Please see the HTTPAsyncFileResponse class for an example of how to do this.
  * 
  * The normal flow of events for an HTTPConnection while responding to a request is like this:
- *  - Send http resopnse headers
+ *  - Send http response headers
  *  - Get data from response via readDataOfLength method.
  *  - Add data to asyncSocket's write queue.
  *  - Wait for asyncSocket to notify it that the data has been sent.
diff --git a/Core/Responses/HTTPAsyncFileResponse.h b/Core/Responses/HTTPAsyncFileResponse.h
index fd60ea83..74741d4f 100644
--- a/Core/Responses/HTTPAsyncFileResponse.h
+++ b/Core/Responses/HTTPAsyncFileResponse.h
@@ -7,7 +7,7 @@
  * This is an asynchronous version of HTTPFileResponse.
  * It reads data from the given file asynchronously via GCD.
  * 
- * It may be overriden to allow custom post-processing of the data that has been read from the file.
+ * It may be overridden to allow custom post-processing of the data that has been read from the file.
  * An example of this is the HTTPDynamicFileResponse class.
 **/
 
@@ -51,7 +51,7 @@
  * 
  * readOffset
  *   Represents the offset of the file descriptor.
- *   In other words, the file position indidcator for our read stream.
+ *   In other words, the file position indicator for our read stream.
  *   It might be easy to think of it as the total number of bytes that have been read from the file.
  *   However, this isn't entirely accurate, as the setOffset: method may have caused us to
  *   jump ahead in the file (lseek).
diff --git a/Core/WebSocket.h b/Core/WebSocket.h
index 4ee51371..6c1d1542 100644
--- a/Core/WebSocket.h
+++ b/Core/WebSocket.h
@@ -69,7 +69,7 @@
 /**
  * Subclass API
  * 
- * These methods are designed to be overriden by subclasses.
+ * These methods are designed to be overridden by subclasses.
 **/
 - (void)didOpen;
 - (void)didReceiveMessage:(NSString *)msg;
diff --git a/Core/WebSocket.m b/Core/WebSocket.m
index 9051ac3e..3993417c 100644
--- a/Core/WebSocket.m
+++ b/Core/WebSocket.m
@@ -229,7 +229,7 @@ - (void)setDelegate:(id)newDelegate
 **/
 - (void)start
 {
-	// This method is not exactly designed to be overriden.
+	// This method is not exactly designed to be overridden.
 	// Subclasses are encouraged to override the didOpen method instead.
 	
 	dispatch_async(websocketQueue, ^{ @autoreleasepool {
@@ -255,7 +255,7 @@ - (void)start
 **/
 - (void)stop
 {
-	// This method is not exactly designed to be overriden.
+	// This method is not exactly designed to be overridden.
 	// Subclasses are encouraged to override the didClose method instead.
 	
 	dispatch_async(websocketQueue, ^{ @autoreleasepool {
diff --git a/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m b/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
index 1ecc94af..6b789b94 100644
--- a/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
+++ b/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
@@ -6340,7 +6340,7 @@ - (void)ssl_startTLS
 		{
 			if (sslMinLevel || sslMaxLevel)
 			{
-				LogWarn(@"kCFStreamSSLLevel security option ignored. Overriden by "
+				LogWarn(@"kCFStreamSSLLevel security option ignored. Overridden by "
 						@"GCDAsyncSocketSSLProtocolVersionMin and/or GCDAsyncSocketSSLProtocolVersionMax");
 			}
 			else