diff --git a/plugins/pyloader/src/sgpem.i b/plugins/pyloader/src/sgpem.i
index a78f7fd..8a986c1 100644
--- a/plugins/pyloader/src/sgpem.i
+++ b/plugins/pyloader/src/sgpem.i
@@ -1,3 +1,24 @@
+// plugins/pyloader/src/sgpem.i - Copyright 2005, 2006, University
+//               of Padova, dept. of Pure and Applied
+//               Mathematics
+//
+// This file is part of SGPEMv2.
+//
+// This is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// SGPEMv2 is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with SGPEMv2; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
 %module sgpem
 %{
 #include <sgpemv2/cpu_policy.hh>
@@ -29,9 +50,6 @@ using namespace sgpem;
 
 // ------------- EXCEPTIONS -------------------------------
 
-/* FIXME : look up into Swig manual the management of 
- * STL exceptions and write wrappers for them.
- */
 %include "exception.i"
 %exception 
 {
@@ -48,7 +66,7 @@ using namespace sgpem;
 
 // Instantiate a Thread* vector for usage with sgpem::Process
 // std::out_of_range should be automatically defined,
-// see Swig manual at the STL Vector §.
+// see Swig manual at the STL Vector .
 %include "std_vector.i"
 namespace std
 {
diff --git a/plugins/xmlsave/src/xml_serializer_factory.hh b/plugins/xmlsave/src/xml_serializer_factory.hh
index 3d10304..6d57d23 100644
--- a/plugins/xmlsave/src/xml_serializer_factory.hh
+++ b/plugins/xmlsave/src/xml_serializer_factory.hh
@@ -1,4 +1,4 @@
-// src/xml_serializer_factory.hh - Copyright 2005, 2006, University
+// plugins/xmlsave/src/xml_serializer_factory.hh - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //
@@ -122,6 +122,6 @@ namespace sgpem
     // to reslove sub requests
     TempMap _temp_map;
   };
-}
+} //~ namespace
 
-#endif
+#endif //~ XML_SERIALIZER_FACTORY_HH
diff --git a/plugins/xmlsave/src/xml_visitor.cc b/plugins/xmlsave/src/xml_visitor.cc
index 6d4e837..b24661e 100644
--- a/plugins/xmlsave/src/xml_visitor.cc
+++ b/plugins/xmlsave/src/xml_visitor.cc
@@ -1,4 +1,4 @@
-// src/backend/serialize_visitor.cc - Copyright 2005, 2006, University
+// plugins/xmlsave/src/xml_visitor.cc - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //
@@ -37,10 +37,12 @@ using namespace sgpem;
 
 XMLVisitor::XMLVisitor(xmlNodePtr current)
     : _current(current)
-{}
+{
+}
 
 XMLVisitor::~XMLVisitor()
-{}
+{
+}
 
 void XMLVisitor::from_resource(const Resource& obj) throw(SerializerError)
 {
@@ -91,11 +93,6 @@ void XMLVisitor::from_resource(const Resource& obj, const Glib::ustring& key) th
 }
 
 
-
-
-
-
-
 void XMLVisitor::from_history(xmlNodePtr parent, const History& hist) throw(SerializerError)
 {
   if (parent != NULL)
diff --git a/plugins/xmlsave/src/xml_visitor.hh b/plugins/xmlsave/src/xml_visitor.hh
index dafa214..84b40f5 100644
--- a/plugins/xmlsave/src/xml_visitor.hh
+++ b/plugins/xmlsave/src/xml_visitor.hh
@@ -1,4 +1,4 @@
-// src/backend/serialize_visitor.hh - Copyright 2005, 2006, University
+// plugin/xmlsave/src/xml_visitor.hh - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //
@@ -127,7 +127,7 @@ namespace sgpem
 
     xmlNodePtr _current;
   };
-}
+} // ~namespace
 
-#endif
+#endif //~ XML_VISITOR_HH