diff --git a/CHANGELOG.md b/CHANGELOG.md
index 373f8d0f1..925809cd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -372,7 +372,7 @@ example by triggering connect in a bg thread.
 
 ### Changed
 
-- As of January 2015, Yowsup is GPLv3 licensed (previouly was MIT)
+- As of January 2015, Yowsup is GPLv3 licensed (previously was MIT)
 - Fixed broadcast
 - Fixed registration no_routes error
 - Updated registration token
@@ -382,7 +382,7 @@ example by triggering connect in a bg thread.
 - Experimental Axolotl support (end-to-end encryption)
 - Upload and send images
 - Initial support for groups v2
-- Easy switch/ add new enviornment (S40/Android ..etc)
+- Easy switch/ add new environment (S40/Android ..etc)
 - _sendIq in YowProtocolLayer and YowInterfaceLayer with callbacks for Iq result and error
 - new send and exit demo
 - E2E encryption in yowsup and echo client demos
diff --git a/yowsup-cli b/yowsup-cli
index 053563181..bb48109a7 100755
--- a/yowsup-cli
+++ b/yowsup-cli
@@ -121,7 +121,7 @@ class YowArgParser(argparse.ArgumentParser):
                 '--config-phone', '--phone',
                 action="store",
                 help="Your full phone number including the country code you defined in 'cc',"
-                     " without preceeding '+' or '00'"
+                     " without preceding '+' or '00'"
             )
             config_group.add_argument(
                 '--config-cc', '--cc',
diff --git a/yowsup/demos/sendclient/layer.py b/yowsup/demos/sendclient/layer.py
index 0f01aaaf3..80e58cb59 100644
--- a/yowsup/demos/sendclient/layer.py
+++ b/yowsup/demos/sendclient/layer.py
@@ -22,7 +22,7 @@ def __init__(self):
     def onSuccess(self, successProtocolEntity):
         self.lock.acquire()
         for target in self.getProp(self.__class__.PROP_MESSAGES, []):
-            #getProp() is trying to retreive the list of (jid, message) tuples, if none exist, use the default []
+            #getProp() is trying to retrieve the list of (jid, message) tuples, if none exist, use the default []
             phone, message = target
             messageEntity = TextMessageProtocolEntity(message, to = Jid.normalize(phone))
             #append the id of message to ackQueue list
diff --git a/yowsup/layers/__init__.py b/yowsup/layers/__init__.py
index 20db3ee86..89c3ea8a7 100644
--- a/yowsup/layers/__init__.py
+++ b/yowsup/layers/__init__.py
@@ -250,7 +250,7 @@ def assert_emitEvent(self, event):
         try:
             self.assertEqual(event, self.upperEventSink.pop())
         except IndexError:
-            raise AssertionError("Event '%s' was not emited through this layer" % (event.getName()))
+            raise AssertionError("Event '%s' was not emitted through this layer" % (event.getName()))
         
     def assert_broadcastEvent(self, event):
         self.broadcastEvent(event)
diff --git a/yowsup/layers/axolotl/protocolentities/message_encrypted.py b/yowsup/layers/axolotl/protocolentities/message_encrypted.py
index c792c7d59..1c00258b5 100644
--- a/yowsup/layers/axolotl/protocolentities/message_encrypted.py
+++ b/yowsup/layers/axolotl/protocolentities/message_encrypted.py
@@ -16,7 +16,7 @@ def __init__(self, encEntities, _type, messageAttributes):
 
     def setEncEntities(self, encEntities = None):
         assert type(encEntities) is list and len(encEntities) \
-            , "Must have at least a list of minumum 1 enc entity"
+            , "Must have at least a list of minimum 1 enc entity"
         self.encEntities = encEntities
 
     def getEnc(self, encType):
diff --git a/yowsup/layers/protocol_media/mediauploader.py b/yowsup/layers/protocol_media/mediauploader.py
index 64ca7502f..b5331e85e 100644
--- a/yowsup/layers/protocol_media/mediauploader.py
+++ b/yowsup/layers/protocol_media/mediauploader.py
@@ -144,6 +144,6 @@ def run(self):
                     self.errorCallback(sourcePath, self.jid, uploadUrl)
 
         except:
-            logger.exception("Error occured at transfer %s" % sys.exc_info()[1])
+            logger.exception("Error occurred at transfer %s" % sys.exc_info()[1])
             if self.errorCallback:
                 self.errorCallback(sourcePath, self.jid, uploadUrl)
diff --git a/yowsup/layers/protocol_messages/layer.py b/yowsup/layers/protocol_messages/layer.py
index f6d26198d..1c6fdfc3e 100644
--- a/yowsup/layers/protocol_messages/layer.py
+++ b/yowsup/layers/protocol_messages/layer.py
@@ -23,7 +23,7 @@ def sendMessageEntity(self, entity):
         if entity.getType() == "text":
             self.entityToLower(entity)
 
-    ###recieved node handlers handlers
+    ###received node handlers handlers
     def recvMessageStanza(self, node):
         protoNode = node.getChild("proto")