diff --git a/.gitignore b/.gitignore
index e9e518c7d..672c3ec18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ Makefile
 makefile
 build*
 prebuilt
-cmake-build-debug/
 
 ##windows build process
 /deps
@@ -27,6 +26,7 @@ Doxygen
 .settings
 .directory
 .idea
+cmake-build-*
 files/windows/*.aps
 ## qt-creator
 CMakeLists.txt.user*
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 40f9c741a..50ee97d1c 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -265,8 +265,6 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
 
     // Autoequip clothing, armor and weapons.
     // Equipping lights is handled in Actors::updateEquippedLight based on environment light.
-
-    // the main loop iterating through all items in inventory
     for (ContainerStoreIterator iter (begin(ContainerStore::Type_Clothing | ContainerStore::Type_Armor)); iter!=end(); ++iter)
     {
         Ptr test = *iter;
@@ -291,8 +289,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
         std::pair<std::vector<int>, bool> itemsSlots =
             iter->getClass().getEquipmentSlots (*iter);
 
-        // nested loop for iterating through avialable NPC slots for equipped items
-        // and checking if current item poited by iter can be placed there
+        // checking if current item poited by iter can be equipped
         for (std::vector<int>::const_iterator iter2 (itemsSlots.first.begin());
             iter2!=itemsSlots.first.end(); ++iter2)
         {
@@ -323,7 +320,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
                     // if left ring is equipped
                     if (*iter2 == Slot_LeftRing)
                     {
-                        // if there is a place for right ring dont swap left leaving right hand empty
+                        // if there is a place for right ring dont swap it
                         if (slots_.at(Slot_RightRing) == end())
                         {
                             continue;