diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cdf4d7352f2773c3c4f99fecbe7d635159e05ad..6de45379662cae1b10d4de84064664f6bc65a05f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ option(ENABLE_ANN "Enable ANN to compute Approximate Nearest Neighbors" ON)
 option(ENABLE_APP_BUNDLE_PATH "Use special install path for .app bundle on Mac" ON)
 option(ENABLE_BAMG "Enable Bamg mesh generator" ON)
 option(ENABLE_BFGS "Enable BFGS" ON)
-option(ENABLE_BLAS_LAPACK "Use BLAS/Lapack for basic linear algebra" ON)
+option(ENABLE_BLAS_LAPACK "Use BLAS and Lapack for linear algebra" ON)
 option(ENABLE_BLOSSOM "Enable Blossom algo (based on MATCH and concorde97)" ON)
 option(ENABLE_CGNS "Enable CGNS mesh export" OFF)
 option(ENABLE_CHACO "Enable Chaco mesh partitioner" ON)
@@ -48,12 +48,12 @@ option(ENABLE_PARSER "Build the GEO file parser" ON)
 option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ON)
 option(ENABLE_PLUGINS "Build the post-processing plugins" ON)
 option(ENABLE_POST "Build the post-processing module" ON)
-option(ENABLE_QT "Build QT GUI" OFF)
+option(ENABLE_QT "Build QT GUI (not functional: for testing only)" OFF)
 option(ENABLE_RBF "Enable RBF project" OFF)
 option(ENABLE_SALOME "Enable Salome routines for CAD healing" ON)
 option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ON)
 option(ENABLE_SOLVER "Enable solver components" ON)
-option(ENABLE_SWIG "Enable swig" ON)
+option(ENABLE_SWIG "Build Swig wrappers" ON)
 option(ENABLE_TAUCS "Enable Taucs linear algebra solver" ON)
 option(ENABLE_TETGEN "Enable Tetgen mesh generator" ON)
 option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF)
@@ -400,7 +400,7 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
   if(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS)
     message(SEND_ERROR "Cannot compile GUI without Mesh, Post or Plugin modules")
   endif(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS)
-  # get jpeg lib (if we have fltk first try to get the local jpeg lib)
+  # get jpeg lib
   if(FLTK_JPEG)
     set_config_option(HAVE_LIBJPEG "Jpeg(Fltk)")
   else(FLTK_JPEG)
@@ -411,7 +411,7 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
       list(APPEND EXTERNAL_INCLUDES ${JPEG_INCLUDE_DIR})
     endif(JPEG_FOUND)
   endif(FLTK_JPEG)
-  # get zlib (if we have fltk first try to get the local zlib)
+  # get zlib
   if(FLTK_Z)
     set_config_option(HAVE_LIBZ "Zlib(Fltk)")
   else(FLTK_Z)
@@ -422,7 +422,7 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
       list(APPEND EXTERNAL_INCLUDES ${ZLIB_INCLUDE_DIR})
     endif(ZLIB_FOUND)
   endif(FLTK_Z)
-  # get png lib (if we have fltk first try to get the local png lib)
+  # get png lib
   if(HAVE_LIBZ)
     if(FLTK_PNG)
       set_config_option(HAVE_LIBPNG "Png(Fltk)")