diff --git a/doc/reference/python/wrap_generator/cfunction.rst b/doc/reference/python/wrap_generator/cfunction.rst
new file mode 100644
index 00000000..8f8026cb
--- /dev/null
+++ b/doc/reference/python/wrap_generator/cfunction.rst
@@ -0,0 +1,7 @@
+The cfunction class
+-----------------------
+
+.. autoclass:: pytriqs.wrap_generator.wrap_generator.cfunction
+   :members:
+   :undoc-members:
+
diff --git a/doc/reference/python/wrap_generator/class.rst b/doc/reference/python/wrap_generator/class.rst
new file mode 100644
index 00000000..4979b51e
--- /dev/null
+++ b/doc/reference/python/wrap_generator/class.rst
@@ -0,0 +1,7 @@
+The class_ class
+-----------------------
+
+.. autoclass:: pytriqs.wrap_generator.wrap_generator.class_
+   :members:
+   :undoc-members:
+ 
diff --git a/doc/reference/python/wrap_generator/contents.rst b/doc/reference/python/wrap_generator/contents.rst
new file mode 100644
index 00000000..777b0d19
--- /dev/null
+++ b/doc/reference/python/wrap_generator/contents.rst
@@ -0,0 +1,20 @@
+.. index:: wrapper
+
+.. module:: pytriqs.wrap_generator.wrap_generator
+
+.. _wrapper:
+
+C++/Python wrapper generator
+=======================================
+
+Reference doc. Intro. to be written.
+
+.. toctree::
+   :maxdepth: 1
+
+   module
+   class
+   cfunction
+   example
+
+
diff --git a/doc/reference/python/wrap_generator/module.rst b/doc/reference/python/wrap_generator/module.rst
new file mode 100644
index 00000000..8108506b
--- /dev/null
+++ b/doc/reference/python/wrap_generator/module.rst
@@ -0,0 +1,9 @@
+
+The module_ class
+-----------------------
+
+.. autoclass:: pytriqs.wrap_generator.wrap_generator.module_
+   :members:
+   :undoc-members:
+
+
diff --git a/pytriqs/gf/local/gf_desc.py b/pytriqs/gf/local/gf_desc.py
index f39db33d..0f4e148f 100644
--- a/pytriqs/gf/local/gf_desc.py
+++ b/pytriqs/gf/local/gf_desc.py
@@ -470,6 +470,5 @@ module.add_function(name = "make_gf_from_inverse_fourier", signature="gf_view<re
 ##   Code generation
 ########################
 
-if __name__ == '__main__' :
-   module.generate_code()
+module.generate_code()
 
diff --git a/pytriqs/operators/operators2_desc.py b/pytriqs/operators/operators2_desc.py
index dcc96c98..fb6f3964 100644
--- a/pytriqs/operators/operators2_desc.py
+++ b/pytriqs/operators/operators2_desc.py
@@ -28,7 +28,5 @@ for name, doc in [ ("c","annihilation operator"), ("c_dag","creation operator")]
             ]:
         module.add_function(name = name, signature="many_body_operator<double>(%s)"%sign, doc=doc)
 
-# to generate the module code
-if __name__ == '__main__' :
-   module.generate_code()
+module.generate_code()
 
diff --git a/pytriqs/wrap_generator/wrap_generator.py b/pytriqs/wrap_generator/wrap_generator.py
index f3b28e00..f62c3efa 100644
--- a/pytriqs/wrap_generator/wrap_generator.py
+++ b/pytriqs/wrap_generator/wrap_generator.py
@@ -449,7 +449,7 @@ class class_ :
               otherwise the behaviour is undefined.
        """
         f = cfunction(signature, calling_pattern = calling_pattern, no_self_c = no_self_c, is_constructor = False,
-             is_method = True,  is_static = is_static, release_GIL_and_enable_signal = release_GIL_and_enable_signal, doc = doc, c_name = c_name)
+             is_method = True,  is_static = is_static, release_GIL_and_enable_signal = release_GIL_and_enable_signal, doc = doc, c_name = c_name or name)
         name = name or f.c_name
         if name not in self.methods :
             self.methods[name] = pyfunction(name = name, is_method = True, is_static = is_static, doc = doc, python_precall = python_precall, python_postcall = python_postcall)