diff --git a/CHANGELOG b/CHANGELOG
index 06e690a55..3ce8ff3a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,26 @@
+=========================================
+Version 0.1.3
+
+- Fixed opacity blending of "Color" mode in RGB and Lab colorspaces
+- Fixed opacity blending of "Luminosity" mode in Lab colorspace
+- Fixed filling of layer list of clone tool: for clone layers inserted
+  in layer masks, the parent layer was incorrectly included in the list,
+  leading to a possible unresolvable circular dependency between 
+  the clone layer and its source. Now the parent layer is not included
+  anymore in the list of possible clone sources.
+- original "visible" flag of layers renamed to "enabled", and added a new "visible"
+  flag to indicate if a given layer is either directly hidden or indirectly hidden
+  because some of its parents are hidden.
+  The "enabled" flag now indicates if the layer is directly hidden.
+- Removed fatal assertion on the validity of the output image from layer extra inputs.
+  Now if the image is invalid a NULL pointer is simply added to the list of extra inputs,
+  without causing a program crash. Nevertheless, a notification mechanism should be
+  introduced to inform the user of the abnormal situation.
+- Fixed corruption of RAW image metadata at zoom levels below 100%
+- Fixed bug in the image preview at program startup
+- Fixed several clang compilation warnings
+
+
 =========================================
 Version 0.1.2
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93af1186e..c579507ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ endif()
   MESSAGE( STATUS "GTKMM3_FOUND:         " ${GTKMM3_FOUND} )
 
   
+IF(NOT MINGW)
 #need to put here do setting LOCALE_DIR variable
 if(USE_NLS)
 find_package(Gettext)
@@ -91,6 +92,8 @@ if(Gettext_FOUND)
 	endif(NOT LOCALE_DIR)
 endif(Gettext_FOUND)
 endif(USE_NLS)
+ENDIF(NOT MINGW)
+MESSAGE( STATUS "Msgfmt_FOUND:         " ${Msgfmt_FOUND} )
 
 
 add_subdirectory(src) 
diff --git a/VERSION b/VERSION
index d917d3e26..b1e80bb24 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/src/base/blend_color.hh b/src/base/blend_color.hh
index 5a4c3f607..c241d843e 100644
--- a/src/base/blend_color.hh
+++ b/src/base/blend_color.hh
@@ -55,16 +55,17 @@ class BlendColor<T, PF_COLORSPACE_RGB, CHMIN, CHMAX, false>:
 {
   int pos, ch;
   double temp_top;
-  double rgb[3];
+  double irgb[3], rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     // RGB values of the bottom layer
-    double ired = (double(bottom[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
-    double igreen = (double(bottom[x+1]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
-    double iblue = (double(bottom[x+2]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
+    // RGB values of the bottom layer
+    irgb[0] = (double(bottom[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
+    irgb[1] = (double(bottom[x+1]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
+    irgb[2] = (double(bottom[x+2]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
     // Luminance value of the bottom layer
-    double lumi = PF::luminance( ired, igreen, iblue );
+    double lumi = PF::luminance( irgb[0], irgb[1], irgb[2] );
 
     // RGB values of the top layer
     double ored = (double(top[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
@@ -78,7 +79,7 @@ public:
 
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
-      out[pos] = (T)(( (rgb[ch]*opacity)+(rgb[ch]*(1.0f-opacity)) )*FormatInfo<T>::RANGE - FormatInfo<T>::MIN);
+      out[pos] = (T)(( (rgb[ch]*opacity)+(irgb[ch]*(1.0f-opacity)) )*FormatInfo<T>::RANGE - FormatInfo<T>::MIN);
     }
   }
 };
@@ -112,13 +113,13 @@ class BlendColor<T, PF_COLORSPACE_LAB, CHMIN, CHMAX, false>:
   double temp_top;
   double rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=0; ch++, pos++ ) 
       out[pos] = bottom[pos];
     for( ; ch<=CHMAX; ch++, pos++ ) 
-      out[pos] = top[pos];
+      out[pos] = static_cast<T>( opacity*top[pos]+(1.0f-opacity)*bottom[pos] );
   }
 };
 
diff --git a/src/base/blend_grain_extract.hh b/src/base/blend_grain_extract.hh
index b593a2e5d..ca2b82acc 100644
--- a/src/base/blend_grain_extract.hh
+++ b/src/base/blend_grain_extract.hh
@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendGrainExtract: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendGrainExtract<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   typename FormatInfo<T>::PROMOTED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
@@ -68,7 +67,7 @@ class BlendGrainExtract<T, CS, CHMIN, CHMAX, true>:
   typename FormatInfo<T>::PROMOTED ptop;
   float opacity_real;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap)
   {
     opacity_real = opacity*(this->pmap[xomap]+FormatInfo<T>::MIN)/(FormatInfo<T>::RANGE);
     xomap += 1;
diff --git a/src/base/blend_grain_merge.hh b/src/base/blend_grain_merge.hh
index d1b34623f..98066b7d0 100644
--- a/src/base/blend_grain_merge.hh
+++ b/src/base/blend_grain_merge.hh
@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendGrainMerge: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendGrainMerge<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   typename FormatInfo<T>::SIGNED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
diff --git a/src/base/blend_hard_light.hh b/src/base/blend_hard_light.hh
index 6830b9722..23b62dc5b 100644
--- a/src/base/blend_hard_light.hh
+++ b/src/base/blend_hard_light.hh
@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendHardLight: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
diff --git a/src/base/blend_lighten.hh b/src/base/blend_lighten.hh
index 43c9730b6..388b1dfcf 100644
--- a/src/base/blend_lighten.hh
+++ b/src/base/blend_lighten.hh
@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendLighten: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendLighten<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   T temp_top;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
@@ -94,7 +93,7 @@ class BlendLighten<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>:
 {
   T temp_top;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     if( bottom[x]>top[x] ) temp_top = bottom[x];
     else temp_top = top[x];
diff --git a/src/base/blend_luminosity.hh b/src/base/blend_luminosity.hh
index 9702f9cb8..294457d12 100644
--- a/src/base/blend_luminosity.hh
+++ b/src/base/blend_luminosity.hh
@@ -58,7 +58,7 @@ class BlendLuminosity<T, PF_COLORSPACE_RGB, CHMIN, CHMAX, false>:
   double irgb[3];
   double rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     // RGB values of the bottom layer
     irgb[0] = (double(bottom[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
@@ -113,11 +113,11 @@ class BlendLuminosity<T, PF_COLORSPACE_LAB, CHMIN, CHMAX, false>:
   double temp_top;
   double rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=0; ch++, pos++ ) 
-      out[pos] = top[pos];
+      out[pos] = static_cast<T>( opacity*top[pos]+(1.0f-opacity)*bottom[pos] );
     for( ; ch<=CHMAX; ch++, pos++ ) 
       out[pos] = bottom[pos];
   }
diff --git a/src/base/blend_multiply.hh b/src/base/blend_multiply.hh
index 84b174bc6..308606ea8 100644
--- a/src/base/blend_multiply.hh
+++ b/src/base/blend_multiply.hh
@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendMultiply: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendMultiply<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   typename FormatInfo<T>::PROMOTED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
@@ -95,7 +94,7 @@ class BlendMultiply<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>:
 {
   typename FormatInfo<T>::PROMOTED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     ptop = top[x];
     ptop *= bottom[x];
diff --git a/src/base/blend_normal.hh b/src/base/blend_normal.hh
index 8e93f5ba0..1eb1948ed 100644
--- a/src/base/blend_normal.hh
+++ b/src/base/blend_normal.hh
@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendNormal: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -45,7 +46,7 @@ class BlendNormal<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>:
   public BlendBase<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     out[x] = (T)(opacity*top[x] + (1.0f-opacity)*bottom[x]);
   }
@@ -74,7 +75,7 @@ class BlendNormal<T, PF_COLORSPACE_RGB, CHMIN, CHMAX, false>:
 {
   int ch, pos;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     // The target channel(s) get blended
@@ -135,7 +136,7 @@ class BlendNormal<T, PF_COLORSPACE_LAB, CHMIN, CHMAX, false>:
 {
   int ch, pos;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     // The target channel(s) get blended
@@ -190,7 +191,7 @@ class BlendNormal<T, PF_COLORSPACE_CMYK, CHMIN, CHMAX, false>:
 {
   int ch, pos;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     // The target channel(s) get blended
diff --git a/src/base/blend_overlay.hh b/src/base/blend_overlay.hh
index df2ebcc8f..b9855f7f9 100644
--- a/src/base/blend_overlay.hh
+++ b/src/base/blend_overlay.hh
@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendOverlay: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -50,7 +51,7 @@ class BlendOverlay<T, CS, CHMIN, CHMAX, false>:
   typename FormatInfo<T>::PROMOTED psum;
 public:
   BlendOverlay(): BlendBase<T, CS, CHMIN, CHMAX, false>(), psum(FormatInfo<T>::MAX + FormatInfo<T>::MIN) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     //psum = FormatInfo<T>::MAX + FormatInfo<T>::MIN;
diff --git a/src/base/blend_passthrough.hh b/src/base/blend_passthrough.hh
index fbd4f1a29..9bb263586 100644
--- a/src/base/blend_passthrough.hh
+++ b/src/base/blend_passthrough.hh
@@ -34,7 +34,6 @@ class BlendPassthrough: public BlendBase<T, CS, CHMIN, CHMAX, has_omap>
 {
   int ch;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
diff --git a/src/base/blend_screen.hh b/src/base/blend_screen.hh
index 638759ef0..a9bba4a99 100644
--- a/src/base/blend_screen.hh
+++ b/src/base/blend_screen.hh
@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendScreen: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -50,7 +51,7 @@ class BlendScreen<T, CS, CHMIN, CHMAX, false>:
   typename FormatInfo<T>::PROMOTED psum;
 public:
   BlendScreen(): BlendBase<T, CS, CHMIN, CHMAX, false>(), psum(FormatInfo<T>::MAX + FormatInfo<T>::MIN) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     //psum = FormatInfo<T>::MAX + FormatInfo<T>::MIN;
diff --git a/src/base/blend_soft_light.hh b/src/base/blend_soft_light.hh
index 98692ece1..9dea62d42 100644
--- a/src/base/blend_soft_light.hh
+++ b/src/base/blend_soft_light.hh
@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendSoftLight: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -55,7 +56,7 @@ public:
                     psum((typename FormatInfo<T>::PROMOTED)(FormatInfo<T>::MAX) + FormatInfo<T>::MIN), 
                     MAX2((typename FormatInfo<T>::PROMOTED)(FormatInfo<T>::MAX)*FormatInfo<T>::MAX),
                     sqrtMAX( sqrt(FormatInfo<T>::MAX) ) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     //psum = FormatInfo<T>::MAX + FormatInfo<T>::MIN;
diff --git a/src/base/blend_vivid_light.hh b/src/base/blend_vivid_light.hh
index 9eef56121..9aa3ecce8 100644
--- a/src/base/blend_vivid_light.hh
+++ b/src/base/blend_vivid_light.hh
@@ -31,6 +31,7 @@
 //#include "vivid_light.hh"
 
 
+/*
 static float color_burn(float top, float bottom)
 {
   if( top == 1 ) return 0;
@@ -46,13 +47,15 @@ static float color_dodge(float top, float bottom)
   float result = bottom / (1.0f-top);
   return( (result>1) ? 1 : result );
 }
+*/
 
 
 template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_omap>
 class BlendVividLight: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -70,7 +73,7 @@ class BlendVividLight<T, CS, CHMIN, CHMAX, false>:
   typename FormatInfo<T>::PROMOTED psum;
 public:
   BlendVividLight(): BlendBase<T, CS, CHMIN, CHMAX, false>(), psum(FormatInfo<T>::MAX + FormatInfo<T>::MIN) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
 #ifdef DO_WARNINGS
 #warning "TODO: optimize vivid light blend"
diff --git a/src/base/cachebuffer.cc b/src/base/cachebuffer.cc
index d71d58381..2996c9de3 100644
--- a/src/base/cachebuffer.cc
+++ b/src/base/cachebuffer.cc
@@ -107,7 +107,7 @@ void PF::CacheBuffer::step()
     lseek( fd, offset, SEEK_SET );
     p = VIPS_REGION_ADDR( reg, tile_area.left, tile_area.top+y );
     ssize_t n = ::write( fd, p, VIPS_REGION_SIZEOF_LINE(reg) );
-    if( n != VIPS_REGION_SIZEOF_LINE(reg) )
+    if( n != (ssize_t)VIPS_REGION_SIZEOF_LINE(reg) )
       break;
     offset += VIPS_IMAGE_SIZEOF_LINE(image);
   }
diff --git a/src/base/format_info.hh b/src/base/format_info.hh
index 85030c82e..788e866f8 100644
--- a/src/base/format_info.hh
+++ b/src/base/format_info.hh
@@ -131,6 +131,17 @@ namespace PF
   }
   */
 
+  /*
+  template < typename Tin, typename T >
+  void clip(const Tin& val, T& clipped)
+  {
+    if(val > FormatInfo<T>::MAX) clipped = FormatInfo<T>::MAX;
+    else if(val < FormatInfo<T>::MIN) clipped = FormatInfo<T>::MIN;
+    else clipped = (T)val;
+    //std::cout<<"val="<<(int)val<<"  max="<<(int)FormatInfo<T>::MAX<<"  min="<<(int)FormatInfo<T>::MIN<<"  clipped="<<(int)clipped<<std::endl;
+  }
+*/
+
   template < typename T > 
   void clip(const typename FormatInfo<T>::SIGNED& val, T& clipped)
   {
diff --git a/src/base/imageprocessor.cc b/src/base/imageprocessor.cc
index f2aeca8e9..15d6af5b0 100644
--- a/src/base/imageprocessor.cc
+++ b/src/base/imageprocessor.cc
@@ -33,10 +33,11 @@
 #include "imageprocessor.hh"
 
 
-static gpointer run_image_processor( gpointer data )
+static gpointer run_image_processor( gpointer /*data*/ )
 {
 	std::cout<<"Calling ImageProcessor::instance().run()"<<std::endl;
   PF::ImageProcessor::Instance().run();
+  //return data;
 }
 
 
diff --git a/src/base/imagepyramid.cc b/src/base/imagepyramid.cc
index 3c5bb7474..f7f195ef5 100644
--- a/src/base/imagepyramid.cc
+++ b/src/base/imagepyramid.cc
@@ -171,13 +171,13 @@ void PF::ImagePyramid::update( const VipsRect& area )
     area_out.width = area_in.width/2 + 1;
     area_out.height = area_in.height/2 + 1;
 
-    unsigned int out_right = area_out.left + area_out.width - 1;
+    int out_right = area_out.left + area_out.width - 1;
     if( out_right >= out_width ) {
       area_out.width -= (out_right-out_width-1);
       out_right = area_out.left + area_out.width - 1;
     }
 
-    unsigned int out_bottom = area_out.top + area_out.height - 1;
+    int out_bottom = area_out.top + area_out.height - 1;
     if( out_bottom >= out_height ) {
       area_out.height -= (out_bottom-out_height-1);
       out_bottom = area_out.top + area_out.height - 1;
@@ -196,7 +196,7 @@ void PF::ImagePyramid::update( const VipsRect& area )
     area_in.width = area_out.width*2;
     area_in.height = area_out.height*2;
 
-    unsigned int x, x2, y, in_linesz = area_in.width*pelsz, out_linesz = area_out.width*pelsz;
+    int x, x2, y, in_linesz = area_in.width*pelsz, out_linesz = area_out.width*pelsz;
 
     unsigned char* buf_in = new unsigned char[in_linesz];
     if( !buf_in ) break;
diff --git a/src/base/layer.cc b/src/base/layer.cc
index 43ef2e322..695b9bd30 100644
--- a/src/base/layer.cc
+++ b/src/base/layer.cc
@@ -44,6 +44,7 @@ PF::Layer::Layer(int32_t i, bool c):
   dirty = true;
   modified_flag = true;
 
+  enabled = true;
   visible = true;
 
   normal = true;
@@ -162,9 +163,9 @@ void PF::Layer::remove_input(int32_t lid)
 bool PF::Layer::save( std::ostream& ostr, int level )
 {
   for(int i = 0; i < level; i++) ostr<<"  ";
-  ostr<<"<layer name=\""<<name<<"\" id=\""<<id<<"\" visible=\""<<visible<<"\" normal=\""<<normal<<"\" extra_inputs=\"";
+  ostr<<"<layer name=\""<<name<<"\" id=\""<<id<<"\" visible=\""<<enabled<<"\" normal=\""<<normal<<"\" extra_inputs=\"";
   int n;
-  for( int i=0, n=0; i < extra_inputs.size(); i++ ) {
+  for( size_t i=0, n=0; i < extra_inputs.size(); i++ ) {
     int32_t id = extra_inputs[i].first.first;
     int32_t imgid = extra_inputs[i].first.second;
     if( id < 0 ) continue;
diff --git a/src/base/layer.hh b/src/base/layer.hh
index f53f4de35..83bb7bed5 100644
--- a/src/base/layer.hh
+++ b/src/base/layer.hh
@@ -64,6 +64,7 @@ namespace PF
 
     bool modified_flag;
 
+    bool enabled;
     bool visible;
 
     bool normal;
@@ -111,20 +112,26 @@ namespace PF
     void clear_dirty( ) { dirty = false; }
     
 
-    bool is_visible() { return visible; }
-    void set_visible( bool d )
+    bool is_enabled() { return enabled; }
+    void set_enabled( bool d )
     {
-      bool old = visible;
-      visible = d;
-      if( visible != old ) modified();
+      bool old = enabled;
+      enabled = d;
+      if( enabled != old ) modified();
     }
-    void clear_visible( )
+    void clear_enabled( )
     {
-      bool old = visible;
-      visible = false;
-      if( visible != old ) modified();
+      bool old = enabled;
+      enabled = false;
+      if( enabled != old ) modified();
     }
     
+    bool is_visible() { return visible; }
+    void set_visible( bool d )
+    {
+      visible = d;
+    }
+
     bool is_group() { return( !normal ); }
     bool is_normal() { return normal; }
     void set_normal( bool d ) { normal = d; }
diff --git a/src/base/layermanager.cc b/src/base/layermanager.cc
index 709a4fb37..be69f9238 100644
--- a/src/base/layermanager.cc
+++ b/src/base/layermanager.cc
@@ -72,7 +72,7 @@ void PF::LayerManager::delete_layer( PF::Layer* layer )
     std::cout<<"ERROR: LayerManager::delete_layer(): layer->get_id() < 0"<<std::endl;
     return;
   }
-  if( layer->get_id() >= layers_pool.size() ) {
+  if( layer->get_id() >= (int)layers_pool.size() ) {
     std::cout<<"ERROR: LayerManager::delete_layer(): layer->get_id() >= layers_pool.size()"<<std::endl;
     return;
   }
@@ -200,7 +200,11 @@ void PF::LayerManager::get_child_layers( Layer* layer, std::list<Layer*>& childr
   get_child_layers( layer, *clist, children );
 }
 
-
+/*
+ * Fill th list of layers that are parent of a target layer, i.e. the list of layers
+ * that contribute to the input of the target layer (excluding the mask associated
+ * to the target layer itself)
+ */
 bool PF::LayerManager::get_parent_layers(Layer* layer, 
                                          std::list< std::pair<std::string,Layer*> >& plist,
                                          std::string parent_name, std::list<Layer*>& list)
@@ -217,12 +221,6 @@ bool PF::LayerManager::get_parent_layers(Layer* layer,
 #ifndef NDEBUG
     std::cout<<"  checking layer \""<<l->get_name()<<"\"("<<l->get_id()<<")"<<std::endl;
 #endif
-    if( l->get_id() != layer->get_id() ) {
-      plist.push_back( make_pair( name, l ) );
-#ifndef NDEBUG
-      std::cout<<"    added."<<std::endl;
-#endif
-    }
 
     if( get_parent_layers( layer, plist, name, l->sublayers ) )
       return true;
@@ -233,6 +231,13 @@ bool PF::LayerManager::get_parent_layers(Layer* layer,
     if( get_parent_layers( layer, plist, name+"/OMap/", l->omap_layers ) )
       return true;
 
+    if( l->get_id() != layer->get_id() ) {
+      plist.push_back( make_pair( name, l ) );
+#ifndef NDEBUG
+      std::cout<<"    added."<<std::endl;
+#endif
+    }
+
     if( l->get_id() == layer->get_id() ) 
       return true;
   }
@@ -385,14 +390,14 @@ PF::CacheBuffer* PF::LayerManager::get_cache_buffer( rendermode_t mode, std::lis
     PF::Layer* l = *li;
 
     if( !l ) continue;
-    if( !l->is_visible() ) continue;
+    if( !l->is_enabled() ) continue;
     //std::cout<<"LayerManager::get_cache_buffer(): checking layer "<<l->get_name()<<std::endl;
 
     PF::CacheBuffer* buf = NULL;
     /*
     for( unsigned int i = 0; i < l->extra_inputs.size(); i++ ) {
       Layer* lextra = get_layer( l->extra_inputs[i].first );
-      if( lextra && lextra->is_visible() && lextra->is_cached() && lextra->get_cache_buffer(mode) &&
+      if( lextra && lextra->is_enabled() && lextra->is_cached() && lextra->get_cache_buffer(mode) &&
           !lextra->get_cache_buffer(mode)->is_completed() ) {
         buf = lextra->get_cache_buffer( mode );
 #ifndef NDEBUG
@@ -427,7 +432,7 @@ PF::CacheBuffer* PF::LayerManager::get_cache_buffer( rendermode_t mode, std::lis
       std::cout<<"Layer \""<<l->get_name()<<"\": pending cache buffer "<<buf<<std::endl;
       std::cout<<"  l->get_image()->get_npipelines()="<<l->get_image()->get_npipelines()<<std::endl;
 #endif
-      for( int pi = 0; pi < l->get_image()->get_npipelines(); pi++ ) {
+      for( unsigned int pi = 0; pi < l->get_image()->get_npipelines(); pi++ ) {
         PF::Pipeline* pipeline = l->get_image()->get_pipeline(pi);
         //std::cout<<"    l->get_image()->get_pipeline("<<pi<<")->get_render_mode()="
         //    <<pipeline->get_render_mode()<<std::endl;
@@ -460,6 +465,35 @@ void PF::LayerManager::reset_cache_buffers( rendermode_t mode, bool reinit )
 
 
 
+void PF::LayerManager::update_visible( std::list<Layer*>& list, bool visible )
+{
+  std::list<PF::Layer*>::reverse_iterator li;
+  for(li = list.rbegin(); li != list.rend(); ++li) {
+    PF::Layer* l = *li;
+    if(!l) continue;
+
+    // Reset visible flag first
+    l->set_visible( false );
+    // Check if current layer is enabled
+    // If not, this and all subsequent and/or child layers
+    // will be marked as invisible
+    if( !l->is_enabled() ) {
+      visible = false;
+    }
+    l->set_visible( visible );
+
+    // Now we walk through the intensity and opacity maps.
+    update_visible( l->imap_layers, visible );
+
+    update_visible( l->omap_layers, visible );
+
+    // Finally we walk through the sub-layers.
+    update_visible( l->sublayers, visible );
+  }
+}
+
+
+
 void PF::LayerManager::update_dirty( std::list<Layer*>& list, bool& dirty )
 {  
   std::list<PF::Layer*>::iterator li = list.begin();
@@ -644,7 +678,7 @@ VipsImage* PF::LayerManager::rebuild_chain( PF::Pipeline* pipeline, colorspace_t
     g_assert( l->get_blender()->get_par() != NULL );
 
     char* name = (char*)l->get_name().c_str();
-    if( !l->is_visible() ) continue;
+    if( !l->is_enabled() ) continue;
 
 #ifndef NDEBUG
     std::cout<<"PF::LayerManager::rebuild_chain(): processing layer \""<<name<<"\""<<std::endl;
@@ -817,22 +851,40 @@ VipsImage* PF::LayerManager::rebuild_chain( PF::Pipeline* pipeline, colorspace_t
         int imgid = l->extra_inputs[iextra].first.second;
         // If the extra input layer is not found we have a problem, better to give up
         // with an error.
-        g_assert( lextra != NULL );
+        //g_assert( lextra != NULL );
+        if( !lextra ) {
+          in.push_back( NULL );
+          continue;
+        }
+        // If the layer is not visible (either bcause it is disabled,
+        // or one of its parents is disabled) we ignore the associated image
+        if( !(lextra->is_visible()) ) {
+          in.push_back( NULL );
+          continue;
+        }
         PF::PipelineNode* extra_node = pipeline->get_node( lextra->get_id() );
-        g_assert( extra_node != NULL );
+        //g_assert( extra_node != NULL );
+        if( extra_node == NULL ) {
+          in.push_back( NULL );
+          continue;
+        }
         VipsImage* extra_img = NULL;
         // std::cout<<"  imgid="<<imgid<<"  extra_node->images.size()="<<extra_node->images.size()<<std::endl;
         if( l->extra_inputs[iextra].second == true ) {
           extra_img = extra_node->blended;
         } else {
-          if( (imgid>=0) && (imgid<extra_node->images.size()) ) {
+          if( (imgid>=0) && (imgid<(int)extra_node->images.size()) ) {
             extra_img = extra_node->images[imgid];
             //std::cout<<"  extra_node->images[imgid]="<<extra_node->images[imgid]<<std::endl;
           }
         }
         // Similarly, if the extra input layer has no valid image associated to it
         // we have a problem and we gve up
-        g_assert( extra_img != NULL );
+        //g_assert( extra_img != NULL );
+        if( extra_img == NULL ) {
+          in.push_back( NULL );
+          continue;
+        }
         in.push_back( extra_img );
 
         // We inherit the image properties (size, colorspace, ...) from the last extra input
@@ -1081,6 +1133,9 @@ bool PF::LayerManager::rebuild_prepare()
 #ifndef NDEBUG
   std::cout<<"PF::LayerManager::rebuild_prepare(): layers.size()="<<layers.size()<<std::endl;
 #endif
+  bool visible = true;
+  update_visible( layers, visible );
+
   bool dirty = false;
   update_dirty( layers, dirty );
 
diff --git a/src/base/layermanager.hh b/src/base/layermanager.hh
index 7c4142dfc..3019b545c 100644
--- a/src/base/layermanager.hh
+++ b/src/base/layermanager.hh
@@ -67,6 +67,9 @@ namespace PF
 
     PF::CacheBuffer* get_cache_buffer( rendermode_t mode, std::list<Layer*>& list );
 
+    // Walk through the given layer chain and set the "visible" flag
+    void update_visible( std::list<Layer*>& list, bool visible );
+
     // Walk through the given layer chain and set the "dirty" flag of all layers starting from "layer_id" to "true"
     void update_dirty( std::list<Layer*>& list, bool& dirty );
 
diff --git a/src/base/operation.hh b/src/base/operation.hh
index ffc65173e..614f6ea2e 100644
--- a/src/base/operation.hh
+++ b/src/base/operation.hh
@@ -281,7 +281,7 @@ namespace PF
     rendermode_t get_render_mode() { return render_mode; }
     void set_render_mode(rendermode_t m) { render_mode = m; }
 
-    virtual void pre_build( rendermode_t mode ) {}
+    virtual void pre_build( rendermode_t /*mode*/ ) {}
 
     virtual VipsImage* build(std::vector<VipsImage*>& in, int first,
     VipsImage* imap, VipsImage* omap, unsigned int& level);
@@ -395,7 +395,7 @@ namespace PF
   class IntensityProc<T,false>
   {
   public:
-    float get_intensity(float& intensity, T*& p, int& x)
+    float get_intensity(float& intensity, T*& /*p*/, int& /*x*/)
     {
       //std::cout<<"IntensityProc<T,false>::get_intensity()"<<std::endl;
       return(intensity);
@@ -418,7 +418,7 @@ namespace PF
   {
   public:
     T* pmap;
-    void init_line(VipsRegion* omap, int left, int top) { }
+    void init_line(VipsRegion* /*omap*/, int /*left*/, int /*top*/) { }
   };
 
 
diff --git a/src/base/pf_file_loader.cc b/src/base/pf_file_loader.cc
index 7f5fc0cac..332d5486c 100644
--- a/src/base/pf_file_loader.cc
+++ b/src/base/pf_file_loader.cc
@@ -26,6 +26,12 @@
 
   These files are distributed with PhotoFlow - http://aferrero2707.github.io/PhotoFlow/
 
+  Changelog:
+
+  - 2015/06/03
+    Fixed bug that prevented correct loading of presets with multiple layers into a layer mask.
+
+
 */
 
 #include <libgen.h>
@@ -186,25 +192,31 @@ void start_element (GMarkupParseContext *context,
     layer_id_mapper[old_id] = layer;
 
     layer->set_name( name );
-    layer->set_visible( visible );
+    layer->set_enabled( visible );
     layer->set_normal( normal );
 
     if( (version<2) && (normal==0) ) {
+#ifdef DEBUG_PF_LOAD
       std::cout<<"PF::pf_file_loader(): setting group layer operation to \"buffer\""<<std::endl;
+#endif
       PF::ProcessorBase* processor = PF::PhotoFlow::Instance().new_operation( "buffer", current_layer );
       if( processor ) {
+#ifdef DEBUG_PF_LOAD
         std::cout<<"PF::pf_file_loader(): operation created."<<std::endl;
+#endif
         current_op = processor->get_par();
       }
       if( current_op )
         current_op->set_map_flag( current_container_map_flag );
     } 
 
+#ifdef DEBUG_PF_LOAD
     std::cout<<"Layer \""<<layer->get_name()<<"\" extra inputs: ";
     for(unsigned int i = 0; i < layer->get_extra_inputs().size(); i++)
       std::cout<<layer->get_extra_inputs()[i].first.first<<","<<layer->get_extra_inputs()[i].first.second
                <<" (blended="<<layer->get_extra_inputs()[i].second<<")";
     std::cout<<std::endl;
+#endif
 
   } else if( strcmp (element_name, "sublayers") == 0 ) {
 
@@ -221,7 +233,9 @@ void start_element (GMarkupParseContext *context,
       value_cursor++;
     }
 
+#ifdef DEBUG_PF_LOAD
     std::cout<<"\""<<element_name<<"\" start: current_container_map_flag="<<current_container_map_flag<<std::endl;
+#endif
     if( type == "imap" ) {
       current_container = &(current_layer->get_imap_layers());
       current_container_map_flag = true;
@@ -257,24 +271,34 @@ void start_element (GMarkupParseContext *context,
     if( !current_layer ) return;
 
     if( op_type == "blender" ) {
+#ifdef DEBUG_PF_LOAD
       std::cout<<"PF::pf_file_loader(): setting blender operation"<<std::endl;
+#endif
       current_op = NULL;
       if( current_layer->get_blender() ) {
         current_op = current_layer->get_blender()->get_par();
+#ifdef DEBUG_PF_LOAD
         std::cout<<"PF::pf_file_loader(): blender operation set to "<<current_op<<std::endl;
+#endif
       }
     } else {
+#ifdef DEBUG_PF_LOAD
       std::cout<<"PF::pf_file_loader(): creating operation of type "<<op_type<<std::endl;
+#endif
       PF::ProcessorBase* processor = PF::PhotoFlow::Instance().new_operation( op_type, current_layer );
       if( processor ) {
+#ifdef DEBUG_PF_LOAD
         std::cout<<"PF::pf_file_loader(): operation created."<<std::endl;
+#endif
         current_op = processor->get_par();
         if( !PF::PhotoFlow::Instance().is_batch() && current_op->init_hidden() )
-          current_layer->set_visible( false );
+          current_layer->set_enabled( false );
       }
     }
 
+#ifdef DEBUG_PF_LOAD
     std::cout<<"PF::pf_file_loader(): current_container_map_flag="<<current_container_map_flag<<std::endl;
+#endif
     if( current_op )
       current_op->set_map_flag( current_container_map_flag );
 
@@ -295,7 +319,9 @@ void start_element (GMarkupParseContext *context,
       value_cursor++;
     }
 
+#ifdef DEBUG_PF_LOAD
     std::cout<<"PF::pf_file_loader(): setting property \""<<pname<<"\" to \""<<pvalue<<"\""<<std::endl;
+#endif
 
     if( !pname.empty() && !pvalue.empty() ) {
       if( version < 2 &&
@@ -348,25 +374,34 @@ void end_element (GMarkupParseContext *context,
     // is set to the top element of the stack if present, or to NULL otherwise
     layers_stack.pop_back();
     current_layer = NULL;
+#ifdef DEBUG_PF_LOAD
     std::cout<<"\""<<element_name<<"\" end: layers_stack.size()="<<layers_stack.size()<<std::endl;
+#endif
     if( !layers_stack.empty() ) 
       current_layer = layers_stack.back();
+#ifdef DEBUG_PF_LOAD
     std::cout<<"\""<<element_name<<"\" end: current_container_map_flag="<<current_container_map_flag<<std::endl;
-
+#endif
   } else if( strcmp (element_name, "sublayers") == 0 ) {
 
     containers_stack.pop_back();
     current_container = NULL;
+#ifdef DEBUG_PF_LOAD
     std::cout<<"\""<<element_name<<"\" end: containers_stack.size()="<<containers_stack.size()<<std::endl;
+#endif
     if( !containers_stack.empty() ) {
       current_container = containers_stack.back().first;
       current_container_map_flag = containers_stack.back().second;
     }
+#ifdef DEBUG_PF_LOAD
     std::cout<<"\""<<element_name<<"\" end: current_container_map_flag="<<current_container_map_flag<<std::endl;
+#endif
 
     // We also restore the current_layer pointer to the top element of the stack (if present)
     current_layer = NULL;
+#ifdef DEBUG_PF_LOAD
     std::cout<<"\""<<element_name<<"\" end: layers_stack.size()="<<layers_stack.size()<<std::endl;
+#endif
     if( !layers_stack.empty() ) 
       current_layer = layers_stack.back();
 
diff --git a/src/base/pipeline.hh b/src/base/pipeline.hh
index 7b243edfc..b52e1e756 100644
--- a/src/base/pipeline.hh
+++ b/src/base/pipeline.hh
@@ -155,11 +155,11 @@ namespace PF
     //Glib::Threads::Mutex& get_processing_mutex() { return processing_mutex; }
 
     virtual void update( VipsRect* area ) = 0;
-    virtual void sink( const VipsRect& area ) { }
+    virtual void sink( const VipsRect& /*area*/ ) { }
 
-    virtual void process_area( const VipsRect& area ) {}
-    virtual void process_start( const VipsRect& area ) {}
-    virtual void process_end( const VipsRect& area ) {}
+    virtual void process_area( const VipsRect& /*area*/ ) {}
+    virtual void process_start( const VipsRect& /*area*/ ) {}
+    virtual void process_end( const VipsRect& /*area*/ ) {}
   };
 
 }
diff --git a/src/base/property.hh b/src/base/property.hh
index 5c181d7a8..d2149406c 100644
--- a/src/base/property.hh
+++ b/src/base/property.hh
@@ -286,7 +286,7 @@ namespace PF
 
 
   template<typename T>
-  void set_gobject_property(gpointer object, const std::string name, const std::list<T>& value)
+  void set_gobject_property(gpointer /*object*/, const std::string /*name*/, const std::list<T>& /*value*/)
   {
     //g_object_set( object, name.c_str(), value, NULL );
   }
diff --git a/src/gui/imagearea.cc b/src/gui/imagearea.cc
index 64d84d2c8..ba0199bba 100644
--- a/src/gui/imagearea.cc
+++ b/src/gui/imagearea.cc
@@ -92,9 +92,12 @@ gboolean PF::ImageArea::set_size_cb (PF::ImageArea::Update * update)
   std::cout<<"set_size_cb(1): update->image_area->get_hadj()->get_value()="<<update->image_area->get_hadj()->get_value()<<std::endl;
   std::cout<<"                get_lower()="<<update->image_area->get_hadj()->get_lower()<<std::endl;
   std::cout<<"                get_upper()="<<update->image_area->get_hadj()->get_upper()<<std::endl;
+  std::cout<<"                get_page_size()="<<update->image_area->get_hadj()->get_page_size()<<std::endl;
   std::cout<<"set_size_cb(1): update->image_area->get_vadj()->get_value()="<<update->image_area->get_vadj()->get_value()<<std::endl;
   std::cout<<"                get_lower()="<<update->image_area->get_vadj()->get_lower()<<std::endl;
   std::cout<<"                get_upper()="<<update->image_area->get_vadj()->get_upper()<<std::endl;
+  std::cout<<"                get_page_size()="<<update->image_area->get_vadj()->get_page_size()<<std::endl;
+  std::cout<<"update->image_area->set_size_request("<<update->rect.width<<","<<update->rect.height<<")"<<std::endl;
   */
   update->image_area->set_size_request(update->rect.width,update->rect.height);
   // We need to change the upper limits explicitely, since the adjustments are not updated immediately
@@ -118,9 +121,12 @@ gboolean PF::ImageArea::set_size_cb (PF::ImageArea::Update * update)
   std::cout<<"set_size_cb(2): update->image_area->get_hadj()->get_value()="<<update->image_area->get_hadj()->get_value()<<std::endl;
   std::cout<<"                get_lower()="<<update->image_area->get_hadj()->get_lower()<<std::endl;
   std::cout<<"                get_upper()="<<update->image_area->get_hadj()->get_upper()<<std::endl;
+  std::cout<<"                get_page_size()="<<update->image_area->get_hadj()->get_page_size()<<std::endl;
   std::cout<<"set_size_cb(2): update->image_area->get_vadj()->get_value()="<<update->image_area->get_vadj()->get_value()<<std::endl;
   std::cout<<"                get_lower()="<<update->image_area->get_vadj()->get_lower()<<std::endl;
   std::cout<<"                get_upper()="<<update->image_area->get_vadj()->get_upper()<<std::endl;
+  std::cout<<"                get_page_size()="<<update->image_area->get_vadj()->get_page_size()<<std::endl;
+  std::cout<<std::endl;
   */
   g_free (update);
   return FALSE;
@@ -155,7 +161,7 @@ PF::ImageArea::ImageArea( Pipeline* v ):
   maskblend = new PF::Processor<PF::BlenderPar,PF::BlenderProc>();
   invert = new PF::Processor<PF::InvertPar,PF::Invert>();
   convert_format = new PF::Processor<PF::ConvertFormatPar,PF::ConvertFormatProc>();
-  set_size_request( 100, 100 );
+  set_size_request( 1, 1 );
 
   draw_done = vips_g_cond_new();
   draw_mutex = vips_g_mutex_new();
@@ -1057,23 +1063,35 @@ void PF::ImageArea::update( VipsRect* area )
   get_size_request( image_width, image_height );
   float area_center_x = 0;
   float area_center_y = 0;
-  if( image_width>0 && image_height>0 ) {
+#ifdef DEBUG_DISPLAY
+  std::cout<<"#0 area_width="<<area_width<<"  image_width="<<image_width<<std::endl;
+  std::cout<<"   area_height="<<area_height<<"  image_height="<<image_height<<std::endl;
+#endif
+  if( image_width>1 && image_height>1 ) {
     area_center_x = area_left + area_width/2;
     area_center_y = area_top + area_height/2;
-    //std::cout<<"#1 area_center_x="<<area_center_x<<"  area_center_y="<<area_center_y<<std::endl;
+#ifdef DEBUG_DISPLAY
+    std::cout<<"#1 area_center_x="<<area_center_x<<"  area_center_y="<<area_center_y<<std::endl;
+#endif
     area_center_x /= image_width;
     area_center_y /= image_height;
-    //std::cout<<"#2 area_center_x="<<area_center_x<<"  area_center_y="<<area_center_y<<std::endl;
+#ifdef DEBUG_DISPLAY
+    std::cout<<"#2 area_center_x="<<area_center_x<<"  area_center_y="<<area_center_y<<std::endl;
+#endif
   }
 
   area_center_x *= outimg->Xsize;
   area_center_y *= outimg->Ysize;
-  //std::cout<<"#3 area_center_x="<<area_center_x<<"  area_center_y="<<area_center_y<<std::endl;
+#ifdef DEBUG_DISPLAY
+  std::cout<<"#3 area_center_x="<<area_center_x<<"  area_center_y="<<area_center_y<<std::endl;
+#endif
   area_left = area_center_x - area_width/2;
   if( area_left < 0 ) area_left = 0;
   area_top = area_center_y - area_height/2;
   if( area_top < 0 ) area_top = 0;
-  //std::cout<<"#4 area_left="<<area_left<<"  area_top="<<area_top<<std::endl;
+#ifdef DEBUG_DISPLAY
+  std::cout<<"#4 area_left="<<area_left<<"  area_top="<<area_top<<std::endl;
+#endif
 
   Update * update = g_new (Update, 1);
   update->image_area = this;
@@ -1081,8 +1099,8 @@ void PF::ImageArea::update( VipsRect* area )
   update->rect.top = area_top;
   update->rect.width = outimg->Xsize;
   update->rect.height = outimg->Ysize;
-  //std::cout<<"   update->rect: "<<update->rect<<std::endl;
 #ifdef DEBUG_DISPLAY
+  std::cout<<"   update->rect: "<<update->rect<<std::endl;
   std::cout<<"PF::ImageArea::update(): installing set_size callback."<<std::endl;
 #endif
   gdk_threads_add_idle ((GSourceFunc) set_size_cb, update);
diff --git a/src/gui/imageeditor.cc b/src/gui/imageeditor.cc
index 8367f19bc..1ef72631b 100644
--- a/src/gui/imageeditor.cc
+++ b/src/gui/imageeditor.cc
@@ -168,7 +168,7 @@ void PF::ImageEditor::expand_layer( PF::Layer* layer, std::list<PF::Layer*>& lis
     //#ifndef NDEBUG
     std::cout<<"  checking layer \""<<l->get_name()<<"\"("<<l->get_id()<<")"<<std::endl;
     //#endif
-    if( !l->is_visible() ) continue;
+    if( !l->is_enabled() ) continue;
     if( l->get_processor() == NULL ) continue;
     if( l->get_processor()->get_par() == NULL ) continue;
     PF::OpParBase* par = l->get_processor()->get_par();
@@ -214,7 +214,7 @@ void PF::ImageEditor::get_child_layers( Layer* layer, std::list<PF::Layer*>& con
     std::cout<<"  checking layer \""<<l->get_name()<<"\"("<<l->get_id()<<")"<<std::endl;
 #endif
     if( (layer != NULL) && (layer->get_id() == l->get_id()) ) break;
-    if( !l->is_visible() ) continue;
+    if( !l->is_enabled() ) continue;
     if( l->get_processor() == NULL ) continue;
     if( l->get_processor()->get_par() == NULL ) continue;
     PF::OpParBase* par = l->get_processor()->get_par();
@@ -339,7 +339,7 @@ void PF::ImageEditor::open_image()
   //std::cout<<"ImageEditor::open_image(): ... done."<<std::endl;
   PF::Pipeline* pipeline = image->get_pipeline( PIPELINE_ID );
   if( !pipeline ) return;
-  int level = 0;
+  int level = 1;
   pipeline->set_level( level );
 	imageArea->set_shrink_factor( 1 );
   layersWidget.update();
@@ -636,7 +636,7 @@ void PF::ImageEditor::image2layer( gdouble& x, gdouble& y, gdouble& w, gdouble&
   std::list<PF::Layer*>::reverse_iterator li;
   for(li = active_layer_children.rbegin(); li != active_layer_children.rend(); ++li) {
     PF::Layer* l = *li;
-    if( l && l->is_visible() ) {
+    if( l && l->is_enabled() ) {
       // Get the node associated to the layer
       PF::PipelineNode* node = pipeline->get_node( l->get_id() );
       if( !node ) {
@@ -727,7 +727,7 @@ void PF::ImageEditor::layer2image( gdouble& x, gdouble& y, gdouble& w, gdouble&
   std::list<PF::Layer*>::iterator li;
   for(li = active_layer_children.begin(); li != active_layer_children.end(); ++li) {
     PF::Layer* l = *li;
-    if( l && l->is_visible() ) {
+    if( l && l->is_enabled() ) {
       // Get the node associated to the layer
       PF::PipelineNode* node = pipeline->get_node( l->get_id() );
       if( !node ) {
diff --git a/src/gui/layertree.cc b/src/gui/layertree.cc
index 974d99524..1d9d46abc 100644
--- a/src/gui/layertree.cc
+++ b/src/gui/layertree.cc
@@ -222,13 +222,13 @@ void PF::LayerTree::on_cell_toggled( const Glib::ustring& path )
   if (iter) {
     Gtk::TreeModel::Row row = *iter;
     //PF::LayerTreeColumns& columns = columns;
-    bool visible = (*iter)[treeModel->columns.col_visible];
+    bool enabled = (*iter)[treeModel->columns.col_visible];
     PF::Layer* l = (*iter)[treeModel->columns.col_layer];
     if( !l ) return;
 #ifndef NDEBUG
-    std::cout<<"Toggled visibility of layer \""<<l->get_name()<<"\": "<<visible<<std::endl;
+    std::cout<<"Toggled visibility of layer \""<<l->get_name()<<"\": "<<enabled<<std::endl;
 #endif
-    l->set_visible( visible );
+    l->set_enabled( enabled );
     l->set_dirty( true );
     //layer_manager->rebuild( PF::PF_COLORSPACE_RGB, VIPS_FORMAT_UCHAR, 100,100 );
     l->get_image()->update();
@@ -253,7 +253,7 @@ void PF::LayerTree::update_model( Gtk::TreeModel::Row parent_row )
        li != sublayers.end(); li++ ) {
     PF::Layer* l = *li;
     row = *(treeModel->prepend(parent_row.children()));
-    row[treeModel->columns.col_visible] = l->is_visible();
+    row[treeModel->columns.col_visible] = l->is_enabled();
     row[treeModel->columns.col_name] = l->get_name();
     row[treeModel->columns.col_layer] = l;
     if( l->get_processor()->get_par()->has_intensity() )
@@ -291,7 +291,7 @@ void PF::LayerTree::update_model()
       continue;
     }
     Gtk::TreeModel::Row row = *(treeModel->prepend());
-    row[treeModel->columns.col_visible] = l->is_visible();
+    row[treeModel->columns.col_visible] = l->is_enabled();
     row[treeModel->columns.col_name] = l->get_name();
     row[treeModel->columns.col_layer] = l;
     if( l->get_processor()->get_par()->has_intensity() )
@@ -325,7 +325,7 @@ void PF::LayerTree::update_model()
   int layerid;
   for (iter=children.begin(), layerid=0; iter != children.end(); iter++, layerid++) {
     if (layerid >= layers.size()) break;
-    bool visible = layers[layerid]->is_visible();
+    bool visible = layers[layerid]->is_enabled();
     const std::string& name = layers[layerid]->get_name();
     (*iter)[columns.col_visible] = visible;
     (*iter)[columns.col_name] = name;
@@ -342,7 +342,7 @@ void PF::LayerTree::update_model()
   if (layerid < layers.size()) {
     // Append additional layers at the end of the list
     for (; layerid < layers.size(); layerid++) {
-      bool visible = layers[layerid]->is_visible();
+      bool visible = layers[layerid]->is_enabled();
       const std::string& name = layers[layerid]->get_name();
       Gtk::TreeModel::Row row = *(treeModel->append());
       row[columns.col_visible] = visible;
@@ -415,6 +415,7 @@ bool PF::LayerTree::get_row(int id, const Gtk::TreeModel::Children& rows, Gtk::T
         return true;
     }
   }
+  return false;
 }
 
 
diff --git a/src/gui/operations/raw_developer_config.cc b/src/gui/operations/raw_developer_config.cc
index 326d0c2cd..ddb987b42 100644
--- a/src/gui/operations/raw_developer_config.cc
+++ b/src/gui/operations/raw_developer_config.cc
@@ -209,7 +209,7 @@ void PF::RawDeveloperConfigDialog::do_update()
         maker = makermodel;
         model = tmodel;
         wbModeSelector.set_maker_model( maker, model );
-        std::cout<<"RawDeveloperConfigDialog::do_update(): maker="<<maker<<" model="<<model<<std::endl;
+        //std::cout<<"RawDeveloperConfigDialog::do_update(): maker="<<maker<<" model="<<model<<std::endl;
       }
     }
 
diff --git a/src/operations/raw_image.cc b/src/operations/raw_image.cc
index b840d2955..3992fa015 100644
--- a/src/operations/raw_image.cc
+++ b/src/operations/raw_image.cc
@@ -212,29 +212,24 @@ PF::RawImage::RawImage( const std::string f ):
   
   //==================================================================
   // Save the LibRaw parameters into the image
-  void* buf = malloc( sizeof(dcraw_data_t) );
-  if( !buf ) return;
-  memcpy( buf, pdata, sizeof(dcraw_data_t) );
+  void* rawdata_buf = malloc( sizeof(dcraw_data_t) );
+  if( !rawdata_buf ) return;
+  memcpy( rawdata_buf, pdata, sizeof(dcraw_data_t) );
   vips_image_set_blob( image, "raw_image_data",
-		       (VipsCallbackFn) g_free, buf, 
+		       (VipsCallbackFn) g_free, rawdata_buf,
 		       sizeof(dcraw_data_t) );
 
   PF::exif_read( &exif_data, file_name.c_str() );
 
-  buf = malloc( sizeof(exif_data_t) );
-  if( !buf ) return;
-  memcpy( buf, &exif_data, sizeof(exif_data_t) );
+  void* exifdata_buf = malloc( sizeof(exif_data_t) );
+  if( !exifdata_buf ) return;
+  memcpy( exifdata_buf, &exif_data, sizeof(exif_data_t) );
   vips_image_set_blob( image, PF_META_EXIF_NAME,
-           (VipsCallbackFn) PF::exif_free, buf,
+           (VipsCallbackFn) PF::exif_free, exifdata_buf,
            sizeof(exif_data_t) );
 
   //print_exif();
 
-#ifdef PF_USE_LIBRAW
-  delete raw_loader;
-  //return;
-#endif
-
 	//return;
   
   int width = image->Xsize;
@@ -279,7 +274,9 @@ PF::RawImage::RawImage( const std::string f ):
   // Save the LibRaw parameters into the image
   void* buf2 = malloc( sizeof(dcraw_data_t) );
   if( !buf2 ) return;
-  memcpy( buf2, buf, sizeof(dcraw_data_t) );
+  memcpy( buf2, pdata, sizeof(dcraw_data_t) );
+  dcraw_data_t* image_data = (dcraw_data_t*)buf2;
+  std::cout<<"RawImage: WB = "<<image_data->color.cam_mul[0]<<" "<<image_data->color.cam_mul[1]<<" "<<image_data->color.cam_mul[2]<<std::endl;
   vips_image_set_blob( demo_image, "raw_image_data",
 		       (VipsCallbackFn) g_free, buf2, 
 		       sizeof(dcraw_data_t) );
@@ -292,6 +289,11 @@ PF::RawImage::RawImage( const std::string f ):
            sizeof(exif_data_t) );
 /**/
   pyramid.init( demo_image );
+
+#ifdef PF_USE_LIBRAW
+  delete raw_loader;
+  //return;
+#endif
 }
 
 
diff --git a/src/operations/raw_preprocessor.cc b/src/operations/raw_preprocessor.cc
index f3b153edc..c9221f42c 100644
--- a/src/operations/raw_preprocessor.cc
+++ b/src/operations/raw_preprocessor.cc
@@ -115,6 +115,7 @@ VipsImage* PF::RawPreprocessorPar::build(std::vector<VipsImage*>& in, int first,
 
   switch( wb_mode.get_enum_value().first ) {
   case PF::WB_CAMERA:
+    std::cout<<"RawOutputPar::build(): WB = "<<image_data->color.cam_mul[0]<<" "<<image_data->color.cam_mul[1]<<" "<<image_data->color.cam_mul[2]<<std::endl;
     wb_red_current = image_data->color.cam_mul[0];
     wb_green_current = image_data->color.cam_mul[1];
     wb_blue_current = image_data->color.cam_mul[2];