diff --git a/src/challenges/unlock_manager.cpp b/src/challenges/unlock_manager.cpp
index af6e8e878..d8aa0db5f 100644
--- a/src/challenges/unlock_manager.cpp
+++ b/src/challenges/unlock_manager.cpp
@@ -263,9 +263,11 @@ void UnlockManager::computeActive()
             {
                 fprintf(stderr,"Challenge prerequisite '%s' of '%s' not found - ignored\n",
                         pre->c_str(), i->first.c_str());
-                continue;
+                //continue;
+                allSolved=false;
+                break;
             }
-            if(!p->isSolved())
+            else if(!p->isSolved())
             {
                 allSolved=false;
                 break;
diff --git a/src/guiengine/abstract_state_manager.cpp b/src/guiengine/abstract_state_manager.cpp
index c86986634..e72a2d2c6 100644
--- a/src/guiengine/abstract_state_manager.cpp
+++ b/src/guiengine/abstract_state_manager.cpp
@@ -103,8 +103,6 @@ void AbstractStateManager::pushScreen(Screen* screen)
 void AbstractStateManager::replaceTopMostScreen(Screen* screen)
 {
     assert(m_game_mode != GAME);
- 
-    // FIXME : handle cutscenes ?
     
     std::string name = screen->getName();
     
diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
index b078d64f5..c902eb1bd 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -56,7 +56,7 @@ void DynamicRibbonWidget::add()
     //printf("****DynamicRibbonWidget::add()****\n");
 
     m_has_label = (m_text == "bottom");
-    m_label_height = m_has_label ? 25 : 0; // FIXME : get height from font, don't hardcode
+    m_label_height = m_has_label ? 25 : 0; // FIXME : get height from font, don't hardcode (what if label is multiline?)
     
     // ----- add dynamic label at bottom
     if (m_has_label)
diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp
index 4ddecb8e6..b7738f6a8 100644
--- a/src/states_screens/kart_selection.cpp
+++ b/src/states_screens/kart_selection.cpp
@@ -662,7 +662,7 @@ void KartSelectionScreen::init()
             std::string icon_path = file_manager->getDataDir() ;
             icon_path += "/karts/" + prop->getIdent() + "/" + prop->getIconFile();
             w->addItem(prop->getName(), prop->getIdent().c_str(), icon_path.c_str());
-            std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
+            //std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
             break;
         }
     }
@@ -676,7 +676,7 @@ void KartSelectionScreen::init()
             std::string icon_path = file_manager->getDataDir() ;
             icon_path += "/karts/" + prop->getIdent() + "/" + prop->getIconFile();
             w->addItem(prop->getName(), prop->getIdent().c_str(), icon_path.c_str());
-            std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
+            //std::cout << "Add item : " << prop->getIdent().c_str() << std::endl;
         }
     }
     
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index 32777c141..1693df7af 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -192,7 +192,7 @@ void Track::loadTrackInfo(const std::string &filename)
     m_default_ambient_color = video::SColor(255, 120, 120, 120);
     m_sun_ambient_color     = video::SColor(255, 120, 120, 120);
     m_sun_specular_color    = video::SColor(255, 255, 255, 255);
-    m_sun_diffuse_color     = video::SColor(255, 255, 255, 255);
+    m_sun_diffuse_color     = video::SColor(128, 128, 128, 128); 
     XMLNode *root           = file_manager->createXMLTree(m_filename);
         
     if(!root || root->getName()!="track")