diff --git a/hurricane/src/hurricane/ExtensionGo.cpp b/hurricane/src/hurricane/ExtensionGo.cpp
index d6f8125e..8d67ddc5 100644
--- a/hurricane/src/hurricane/ExtensionGo.cpp
+++ b/hurricane/src/hurricane/ExtensionGo.cpp
@@ -57,15 +57,15 @@ namespace Hurricane {
 
   void  ExtensionGo::materialize ()
   {
-    if ( !isMaterialized() ) {
-      if ( _cell ) {
-        ExtensionSlice* slice = _cell->getExtensionSlice ( getName() );
-        if ( !slice ) slice = ExtensionSlice::_create ( _cell, getName() );
-        QuadTree* quadTree = slice->_getQuadTree ();
-        quadTree->insert ( this );
-        _cell->_fit ( quadTree->getBoundingBox() );
+    if (not isMaterialized()) {
+      if (_cell) {
+        ExtensionSlice* slice = _cell->getExtensionSlice( getName() );
+        if (not slice) slice = ExtensionSlice::_create( _cell, getName() );
+        QuadTree* quadTree = slice->_getQuadTree();
+        quadTree->insert( this );
+        _cell->_fit( quadTree->getBoundingBox() );
       } else {
-        cerr << Warning("%s not inserted into QuadTree.",getString(this).c_str()) << endl;
+        cerr << Warning( "%s not inserted into QuadTree.", getString(this).c_str() ) << endl;
       }
     }
   }
@@ -73,20 +73,19 @@ namespace Hurricane {
 
   void ExtensionGo::unmaterialize ()
   {
-  //ltrace(9) << "ExtensionGo::unmaterialize() - " << (void*)this << endl;
-  //ltracein(9);
+    cdebug.log(18,1) << "ExtensionGo::unmaterialize() - start" << (void*)this << endl;
 
     if ( isMaterialized() ) {
-      ExtensionSlice* slice = _cell->getExtensionSlice ( getName() );
-      if ( slice ) {
-        _cell->_unfit ( getBoundingBox() );
-        slice->_getQuadTree()->remove ( this );
-        if ( slice->isEmpty() ) slice->_destroy ();
+      ExtensionSlice* slice = _cell->getExtensionSlice( getName() );
+      if (slice) {
+        _cell->_unfit( getBoundingBox() );
+        slice->_getQuadTree()->remove( this );
+        if (slice->isEmpty()) slice->_destroy();
       }
     }
 
-  //ltrace(9) << "ExtensionGo::unmaterialize() - exit" << endl;
-  //ltraceout(9);
+    cdebug.tabw(18,-1);
+    cdebug.log(18) << "ExtensionGo::unmaterialize() - completed" << endl;
   }
 
 
@@ -105,7 +104,7 @@ namespace Hurricane {
   string ExtensionGo::_getString () const
   {
     string s = Go::_getString();
-    s.insert ( s.length() - 1, " " + getString(getName()) );
+  //s.insert ( s.length() - 1, " " + getString(getName()) );
     return s;
   }
 
diff --git a/hurricane/src/hurricane/hurricane/Commons.h b/hurricane/src/hurricane/hurricane/Commons.h
index 0e777b16..c91ed20f 100644
--- a/hurricane/src/hurricane/hurricane/Commons.h
+++ b/hurricane/src/hurricane/hurricane/Commons.h
@@ -302,7 +302,7 @@ inline Hurricane::Record* getRecord ( std::vector<Element>* v )
   Hurricane::Record* record = NULL;
   if ( !v->empty() ) {
     record = new Hurricane::Record ( "std::vector<Element>" );
-    unsigned n = 1;
+    unsigned n = 0;
     typename std::vector<Element>::iterator iterator = v->begin();
     while ( iterator != v->end() ) {
       record->add ( getSlot<Element>(getString(n++), *iterator) );
@@ -327,7 +327,7 @@ inline Hurricane::Record* getRecord ( const std::vector<Element>* v )
   Hurricane::Record* record = NULL;
   if ( !v->empty() ) {
     record = new Hurricane::Record ( "const std::vector<Element>" );
-    unsigned n = 1;
+    unsigned n = 0;
     typename std::vector<Element>::const_iterator iterator = v->begin();
     while ( iterator != v->end() ) {
       record->add ( getSlot<const Element>(getString(n++), *iterator) );
diff --git a/hurricane/src/hurricane/hurricane/ExtensionGo.h b/hurricane/src/hurricane/hurricane/ExtensionGo.h
index 74b1012e..45663470 100644
--- a/hurricane/src/hurricane/hurricane/ExtensionGo.h
+++ b/hurricane/src/hurricane/hurricane/ExtensionGo.h
@@ -29,8 +29,8 @@
 // +-----------------------------------------------------------------+
 
 
-#ifndef  __HURRICANE_EXTENSION_GO__
-#define  __HURRICANE_EXTENSION_GO__
+#ifndef  HURRICANE_EXTENSION_GO_H
+#define  HURRICANE_EXTENSION_GO_H
 
 #include  "hurricane/Name.h"
 #include  "hurricane/Go.h"
@@ -67,6 +67,6 @@ namespace Hurricane {
 } // End of Hurricane namespace.
 
 
-#endif // __HURRICANE_EXTENSION_GO__
+#endif // HURRICANE_EXTENSION_GO_H
 
 
diff --git a/unicorn/src/cgt.py b/unicorn/src/cgt.py
index ba945c1a..c8ac6c22 100755
--- a/unicorn/src/cgt.py
+++ b/unicorn/src/cgt.py
@@ -9,7 +9,7 @@ try:
   import Hurricane
   import Viewer
   import CRL
-  import Anabatic
+ #import Anabatic
   import Etesian
   import Katabatic
   import Kite