diff --git a/TODO b/TODO
index 363e79f..a01061b 100644
--- a/TODO
+++ b/TODO
@@ -20,8 +20,8 @@ LWM2M Features
  --------
  
  
- Implementation Improvments
- --------------------------
+ Implementation Improvements
+ ---------------------------
  
   - Store lwm2m_transaction_t per peer
   
@@ -42,5 +42,5 @@ LWM2M Features
   
   - Utility functions to easily implements objects
   The utility will just use read and write individual resources. Either statically or
-  throught callbacks. See [https://github.com/01org/libdmclient]/tests/mgtobj/utils/static_mo_util.h
-  
\ No newline at end of file
+  through callbacks. See [https://github.com/01org/libdmclient]/tests/mgtobj/utils/static_mo_util.h
+  
diff --git a/core/block1.c b/core/block1.c
index 20f00e5..b8bc1f1 100644
--- a/core/block1.c
+++ b/core/block1.c
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <stdio.h>
 
-// the maximum payload transfered by block1 we accumulate per server
+// the maximum payload transferred by block1 we accumulate per server
 #define MAX_BLOCK1_SIZE 4096
 
 coap_status_t coap_block1_handler(lwm2m_block1_data_t ** pBlock1Data,
diff --git a/core/tlv.c b/core/tlv.c
index 4ed2e4c..e940342 100644
--- a/core/tlv.c
+++ b/core/tlv.c
@@ -423,7 +423,7 @@ size_t tlv_serialize(bool isResourceInstance,
         {
         case LWM2M_TYPE_MULTIPLE_RESOURCE:
             isInstance = true;
-            // fall throught
+            // fall through
         case LWM2M_TYPE_OBJECT_INSTANCE:
             {
                 uint8_t * tmpBuffer;
diff --git a/examples/bootstrap_server/bootstrap_server.c b/examples/bootstrap_server/bootstrap_server.c
index dc057e1..5f20125 100644
--- a/examples/bootstrap_server/bootstrap_server.c
+++ b/examples/bootstrap_server/bootstrap_server.c
@@ -565,7 +565,7 @@ int main(int argc, char *argv[])
     fclose(fd);
     if (data.bsInfo == NULL)
     {
-        fprintf(stderr, "Reading Bootsrap Info from file %s failed.\r\n", filename);
+        fprintf(stderr, "Reading Bootstrap Info from file %s failed.\r\n", filename);
         return -1;
     }
 
diff --git a/examples/client/object_connectivity_stat.c b/examples/client/object_connectivity_stat.c
index 77a2530..939b32b 100644
--- a/examples/client/object_connectivity_stat.c
+++ b/examples/client/object_connectivity_stat.c
@@ -20,14 +20,14 @@
  * 
  *  Resources:
  *
- *          Name         | ID | Oper. | Inst. | Mand.|  Type   | Range | Units | Descripton |
- *  SMS Tx Counter       |  0 |   R   | Single|  No  | Integer |       |       |            |
- *  SMS Rx Counter       |  1 |   R   | Single|  No  | Integer |       |       |            |
- *  Tx Data              |  2 |   R   | Single|  No  | Integer |       | kByte |            |
- *  Rx Data              |  3 |   R   | Single|  No  | Integer |       | kByte |            |
- *  Max Message Size     |  4 |   R   | Single|  No  | Integer |       | Byte  |            |
- *  Average Message Size |  5 |   R   | Single|  No  | Integer |       | Byte  |            |
- *  StartOrReset         |  6 |   E   | Single|  Yes | Integer |       |       |            |
+ *          Name         | ID | Oper. | Inst. | Mand.|  Type   | Range | Units | Description |
+ *  SMS Tx Counter       |  0 |   R   | Single|  No  | Integer |       |       |             |
+ *  SMS Rx Counter       |  1 |   R   | Single|  No  | Integer |       |       |             |
+ *  Tx Data              |  2 |   R   | Single|  No  | Integer |       | kByte |             |
+ *  Rx Data              |  3 |   R   | Single|  No  | Integer |       | kByte |             |
+ *  Max Message Size     |  4 |   R   | Single|  No  | Integer |       | Byte  |             |
+ *  Average Message Size |  5 |   R   | Single|  No  | Integer |       | Byte  |             |
+ *  StartOrReset         |  6 |   E   | Single|  Yes | Integer |       |       |             |
  */
 
 #include "liblwm2m.h"
diff --git a/examples/shared/dtlsconnection.h b/examples/shared/dtlsconnection.h
index 8eea66c..aa0db20 100644
--- a/examples/shared/dtlsconnection.h
+++ b/examples/shared/dtlsconnection.h
@@ -68,7 +68,7 @@ void connection_free(dtls_connection_t * connList);
 int connection_send(dtls_connection_t *connP, uint8_t * buffer, size_t length);
 int connection_handle_packet(dtls_connection_t *connP, uint8_t * buffer, size_t length);
 
-// rehandshake a connection, usefull when your NAT timeouted and your client have a new IP/PORT
+// rehandshake a connection, useful when your NAT timed out and your client has a new IP/PORT
 int connection_rehandshake(dtls_connection_t *connP, bool sendCloseNotify);
 
 #endif
diff --git a/tests/tlv_json_lwm2m_data_test.c b/tests/tlv_json_lwm2m_data_test.c
index 9eee649..d0931f1 100644
--- a/tests/tlv_json_lwm2m_data_test.c
+++ b/tests/tlv_json_lwm2m_data_test.c
@@ -214,7 +214,7 @@ static void test_raw_expected(const char * uriStr,
     // Serialize to the same format and compare to the input buffer
     test_data_and_compare(uriStr, format, tlvP, size, id, (uint8_t*)expectBuf, expectLen);
 
-    // Serialize to the other format respectivly.
+    // Serialize to the other format respectively.
     if (format == LWM2M_CONTENT_TLV)
         test_data(uriStr, LWM2M_CONTENT_JSON, tlvP, size, id);
     else if (format == LWM2M_CONTENT_JSON)
@@ -326,7 +326,7 @@ static void test_7(void)
                       }";
 
     // We do a string comparison. Because parsing+serialization changes double value
-    // precision, we expect a slighty different output than input.
+    // precision, we expect a slightly different output than input.
     const char * expect = "{\"e\":[                              \
                             {\"n\":\"0\",\"v\":1234},          \
                             {\"n\":\"1\",\"v\":56.78900146484375},        \