diff --git a/apps/trimeshinfo/trimeshinfo.cpp b/apps/trimeshinfo/trimeshinfo.cpp
index 57157dc2..d2943d95 100644
--- a/apps/trimeshinfo/trimeshinfo.cpp
+++ b/apps/trimeshinfo/trimeshinfo.cpp
@@ -1,78 +1,78 @@
 /****************************************************************************
-* VCGLib                                                            o o     *
-* Visual and Computer Graphics Library                            o     o   *
-*                                                                _   O  _   *
-* Copyright(C) 2004                                                \/)\/    *
-* Visual Computing Lab                                            /\/|      *
-* ISTI - Italian National Research Council                           |      *
-*                                                                    \      *
-* All rights reserved.                                                      *
-*                                                                           *
-* This program 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.                                       *
-*                                                                           *
-* This program 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 (http://www.gnu.org/licenses/gpl.txt)          *
-* for more details.                                                         *
-*                                                                           *
+* VCGLib o o *
+* Visual and Computer Graphics Library o o *
+* _ O _ *
+* Copyright(C) 2004 \/)\/ *
+* Visual Computing Lab /\/| *
+* ISTI - Italian National Research Council | *
+* \ *
+* All rights reserved. *
+* *
+* This program 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. *
+* *
+* This program 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 (http://www.gnu.org/licenses/gpl.txt) *
+* for more details. *
+* *
 ****************************************************************************/
 /****************************************************************************
 History
 
 $Log: not supported by cvs2svn $
-Revision 1.5  2005/09/30 13:29:40  rita_borgo
+Revision 1.6 2005/09/30 14:13:01 rita_borgo
+Problem: Text not aligned
+
+Revision 1.5 2005/09/30 13:29:40 rita_borgo
 Fixed Manifold Test
 
-Revision 1.4  2005/09/29 14:48:15  rita_borgo
+Revision 1.4 2005/09/29 14:48:15 rita_borgo
 Fixed code related to creation of the XML file
 
-Revision 1.3  2005/09/28 13:57:09  rita_borgo
+Revision 1.3 2005/09/28 13:57:09 rita_borgo
 Fixed some printout not alligned
 
-Revision 1.2  2005/09/28 10:46:04  rita_borgo
+Revision 1.2 2005/09/28 10:46:04 rita_borgo
 Added possibility of saving File in OFF format
 
-Revision 1.1  2005/09/20 10:15:27  rita_borgo
+Revision 1.1 2005/09/20 10:15:27 rita_borgo
 Changed file name to uniform with other solution projects,
 before was main.cpp
 
-Revision 1.8  2005/02/15 12:26:06  rita_borgo
+Revision 1.8 2005/02/15 12:26:06 rita_borgo
 Minor changes to self-intersection
 
-Revision 1.7  2005/02/07 15:44:31  rita_borgo
+Revision 1.7 2005/02/07 15:44:31 rita_borgo
 Fixed Color and Volume
 
-Revision 1.6  2005/02/01 17:37:53  rita_borgo
+Revision 1.6 2005/02/01 17:37:53 rita_borgo
 Fixed Volume and Color
 
-Revision 1.5  2005/01/18 16:33:12  rita_borgo
+Revision 1.5 2005/01/18 16:33:12 rita_borgo
 Added OFF file Option
 
-Revision 1.4  2005/01/17 18:19:00  rita_borgo
+Revision 1.4 2005/01/17 18:19:00 rita_borgo
 Added new routines.
 Self-intersection first release
 
-Revision 1.2  2005/01/03 16:13:09  rita_borgo
+Revision 1.2 2005/01/03 16:13:09 rita_borgo
 Added Standard comments
 
 
 
 ****************************************************************************/
 #include <vector>
-#include <string>  
+#include <string>
 #include <stack>
 using namespace std;
-
 #include<vcg/simplex/vertex/vertex.h>
 #include<vcg/simplex/face/with/afav.h>
 #include<vcg/simplex/face/topology.h>
-#include<vcg/simplex/face/pos.h>   // mi sembra di averlo aggiunto!
-
-
+#include<vcg/simplex/face/pos.h> // mi sembra di averlo aggiunto!
 #include<vcg/complex/trimesh/base.h>
 #include<vcg/complex/trimesh/update/topology.h>
 #include <vcg/complex/trimesh/update/edges.h>
@@ -84,46 +84,36 @@ using namespace std;
 #include <wrap/io_trimesh/export_ply.h>
 #include <wrap/io_trimesh/export_stl.h>
 #include <wrap/io_trimesh/export_dxf.h>
-
 #include "XMLTree.h"
 #include <wrap/io_trimesh/export_off.h>
-
-
-// loader 
+// loader
 #include<wrap/io_trimesh/import_ply.h>
-
 #include "defs.h"
-
+string ans;
 using namespace vcg;
 using namespace tri;
 using namespace face;
+int prova1;
 
 class MyFace;
 class MyEdge;
-class MyVertex:public Vertex<float,MyEdge,MyFace>{};
+class MyVertex : public Vertex<float,MyEdge,MyFace>{};
 class MyFace :public FaceAFAV<MyVertex,MyEdge,MyFace>{};
 class MyMesh: public tri::TriMesh< std::vector<MyVertex>, std::vector<MyFace > >{};
-
-
-typedef MyMesh::VertexPointer  VertexPointer;
-typedef MyMesh::VertexIterator  VertexIterator;
-
+typedef MyMesh::VertexPointer VertexPointer;
+typedef MyMesh::VertexIterator VertexIterator;
 typedef Point3<MyMesh::ScalarType> Point3x;
 typedef vector<Point3x> Hole;
 
-string ans;
-
 void OpenMesh(const char *filename, MyMesh &m)
 {
 	int err = tri::io::Importer<MyMesh>::Open(m,filename);
-	if(err) {
+	if(err){
 		printf("Error in reading %s: '%s'\n",filename,tri::io::Importer<MyMesh>::ErrorMsg(err));
 		exit(-1);
 	}
-	printf("read mesh `%s'\n", filename);		  
+	printf("read mesh `%s'\n", filename);
 }
-
-
 inline char* GetExtension(char* filename)
 {
 	for(int i=strlen(filename)-1; i >= 0; i--)
@@ -134,11 +124,8 @@ inline char* GetExtension(char* filename)
 	else
 		return NULL;
 }
-
-
-typedef MyMesh::VertexPointer  VertexPointer;
-typedef MyMesh::VertexIterator  VertexIterator;
-
+typedef MyMesh::VertexPointer VertexPointer;
+typedef MyMesh::VertexIterator VertexIterator;
 /* classe di confronto per l'algoritmo di individuazione vertici duplicati*/
 template <class VertexIterator>
 class DuplicateVert_Compare{
@@ -148,80 +135,69 @@ public:
 		return *a < *b;
 	}
 };
-
-static int DuplicateVertex( MyMesh & m )    // V1.0
+static int DuplicateVertex( MyMesh & m )// V1.0
+{if(m.vert.size()==0 || m.vn==0)
+return 0;
+std::map<VertexPointer, VertexPointer> mp;
+int i,j;
+VertexIterator vi;
+int deleted=0;
+int k=0;
+int num_vert = m.vert.size();
+vector<VertexPointer> perm(num_vert);
+for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi, ++k)
+perm[k] = &(*vi);
+DuplicateVert_Compare<VertexPointer> c_obj;
+std::sort(perm.begin(),perm.end(),c_obj);
+j = 0;
+i = j;
+mp[perm[i]] = perm[j];
+++i;
+for(;i!=num_vert;)
 {
-
-	if(m.vert.size()==0 || m.vn==0)
-		return 0;
-	std::map<VertexPointer, VertexPointer> mp;
-	int i,j;
-	VertexIterator vi; 
-	int deleted=0;
-	int k=0;
-	int num_vert = m.vert.size();
-	vector<VertexPointer> perm(num_vert);
-	for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi, ++k)
-		perm[k] = &(*vi);
-
-	DuplicateVert_Compare<VertexPointer> c_obj;
-
-	std::sort(perm.begin(),perm.end(),c_obj);
-	j = 0;
-	i = j;
-	mp[perm[i]] = perm[j];
-	++i;
-	for(;i!=num_vert;)
+	if( (! (*perm[i]).IsD()) &&
+		(! (*perm[j]).IsD()) &&
+		(*perm[i]).P() == (*perm[j]).cP() )
 	{
-		if( (! (*perm[i]).IsD()) && 
-			(! (*perm[j]).IsD()) && 
-			(*perm[i]).P() == (*perm[j]).cP() )
+		if(deleted ==0)
 		{
-			if(deleted ==0)
-			{
-				cout<< "\t Found Duplicated Vertices"<< endl;
-				cout<< "\t do you want to remove them? [y/Y| n/N]\n";
-				cin>>ans;
-			}
-			if((ans == "s") ||(ans=="S"))
-			{
-				VertexPointer t = perm[i];
-				mp[perm[i]] = perm[j];
-				(*t).SetD();
-				m.vn--;
-			}
-			++i;
-			deleted++;// per evitare che su risposta no rifaccia la domanda ad ogni vertice che incontra;
+			cout<< "\t Found Duplicated Vertices"<< endl;
+			cout<< "\t do you want to remove them? [y/Y| n/N]\n";
+			cin>>ans;
 		}
-		else
+		if((ans == "s") ||(ans=="S"))
 		{
-			j = i;
-			++i;
+			VertexPointer t = perm[i];
+			mp[perm[i]] = perm[j];
+			(*t).SetD();
+			m.vn--;
 		}
+		++i;
+		deleted++;// per evitare che su risposta no rifaccia la domanda ad ogni vertice che incontra;
 	}
-	ans.clear();
-	return deleted;
+	else
+	{
+		j = i;
+		++i;
+	}
+}
+ans.clear();
+return deleted;
 }
 
-
 void main(int argc,char ** argv){
-
-
 	MyMesh m;
-	bool DEBUG = true;
-int k;
-	k=3;
+	bool DEBUG=false;
+	
 	int j;
 	j=0;
-cout<<"Punto 1"<<endl;
-	/*------------XML file part ------------------*/
-
-	static char* XML_SCHEMA_NAME = "protegekb";
-	XMLTree	doc;
+	
+	/*------------XML file part ------------------*/static char* XML_SCHEMA_NAME = "protegekb";
+	XMLTree doc;
 	MainNode* mn = new MainNode;
 
 	/*--------------------------------------------*/
-cout<<"Punto 2"<<endl;
+	
 
 	//load the mesh
 	//argv[1]=(char*)"c:\\checkup\\debug\\column1m.ply";
@@ -230,12 +206,12 @@ cout<<"Punto 2"<<endl;
 
 	// print program info
 	printf("-------------------------------\n"
-		"         TriMeshInfo V.1.01 \n"
-		"     http://vcg.isti.cnr.it\n"
-		"   release date: "__DATE__"\n"
+		" TriMeshInfo V.1.01 \n"
+		" http://vcg.isti.cnr.it\n"
+		" release date: "__DATE__"\n"
 		"-------------------------------\n\n");
 
-cout<<"Punto 3"<<endl;
+	
 
 	if(DEBUG)
 		argv[1] = "C:\\sf\\apps\\msvc\\trimeshinfo\\Release\\tests\\kite_hole3.ply";
@@ -249,23 +225,24 @@ cout<<"Punto 3"<<endl;
 			exit(-1);
 		}
 	}
-cout<<"Punto 4"<<endl;
+	
 
 
 	OpenMesh(argv[1],m);
 
-cout<<"Punto 5"<<endl;
+
+
 
 
 	/*------------XML file part ------------------*/
 	doc.initializeMain(XML_SCHEMA_NAME);
 	char* s1 = "http://www.w3.org/2001/XMLSchema-instance";
 	char* s2 = new(char[50]);
-	sprintf(s2,"\"%s\"",s1);	
+	sprintf(s2,"\"%s\"",s1);
 	doc.addHeaders(" xmlns:xsi=", s2);
 	s1 = "http://protege.stanford.edu/plugins/xmlbackend/protege_xml_backend.xsd";
 	s2 = new(char[100]);
-	sprintf(s2,"\"%s\"",s1);	
+	sprintf(s2,"\"%s\"",s1);
 	doc.addHeaders(" xsi:noNamespaceSchemaLocation=", s2);
 	/*--------------------------------------------*/
 
@@ -277,17 +254,16 @@ cout<<"Punto 5"<<endl;
 	fprintf(index,"<p>Number of vertices: %d </p>\n", m.vn);
 	fprintf(index,"<p>Number of faces: %d </p>\n", m.fn);
 	printf("Mesh info:\n");
-	printf("	M: '%s'\n\t Number of vertices: %d \n", argv[1], m.vn);
+	printf(" M: '%s'\n\t Number of vertices: %d \n", argv[1], m.vn);
 	printf("\t Number of faces: %d \n", m.fn);
 
 
-cout<<"Punto 6"<<endl;
 
 	/*------------XML file part ------------------*/
 	NodeGroup* ng = new NodeGroup;
 
 	char* s =new(char[25]);
-	sprintf(s,"%d",m.vn);	
+	sprintf(s,"%d",m.vn);
 	ValueNode* vn = new ValueNode;
 	EntryNode* en = new EntryNode;
 	vn->setValue(s);
@@ -304,7 +280,7 @@ cout<<"Punto 6"<<endl;
 	vn = new ValueNode;
 	en = new EntryNode;
 	osn = new OwnSlotNode;
-	sprintf(s,"%d",m.fn);	
+	sprintf(s,"%d",m.fn);
 	vn->setValue(s);
 	en->addValue(*vn);
 	en->type = "Integer";
@@ -315,7 +291,6 @@ cout<<"Punto 6"<<endl;
 	ng->addNode(osn);
 	/*--------------------------------------------*/
 
-cout<<"Punto 7"<<endl;
 
 
 	if(m.HasPerFaceColor()||m.HasPerVertexColor())
@@ -329,7 +304,7 @@ cout<<"Punto 7"<<endl;
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		sprintf(s,"%f %f %f ",Color[0], Color[1], Color[2]);	
+		sprintf(s,"%f %f %f ",Color[0], Color[1], Color[2]);
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "Float";
@@ -341,7 +316,7 @@ cout<<"Punto 7"<<endl;
 		/*--------------------------------------------*/
 	}
 
-	cout<<"Punto 8"<<endl;
+	
 	vcg::tri::UpdateTopology<MyMesh>::FaceFace(m);
 
 	// IS MANIFOLD
@@ -349,14 +324,19 @@ cout<<"Punto 7"<<endl;
 	MyMesh::FaceIterator gi;
 	vcg::face::Pos<MyMesh::FaceType> he;
 	vcg::face::Pos<MyMesh::FaceType> hei;
-	
-	for(fi=m.face.begin();fi!=m.face.end();++fi)
+
+	for(fi=m.face.begin();fi!=m.face.end();fi++)
+	{
+		(*fi).ClearB(0);
+		(*fi).ClearB(1);
+		(*fi).ClearB(2);
 		(*fi).ClearS();
+	}
 	int cf=0;
 	bool Manifold=true;
-	
-	
-	
+
+
+
 	for(fi=m.face.begin();fi!=m.face.end();++fi)
 	{
 		for (j=0;j<3;j++)
@@ -368,20 +348,19 @@ cout<<"Punto 7"<<endl;
 				--fi;
 				j=3;
 			}
-			else if((!fi->HasFFAdjacency())&&(fi!=m.face.begin()))
-			{
-				Manifold = false;
-				fi= m.face.end();
-				--fi;
-				j=3;
-			}
+		}
+		if((BorderCount(*fi)>0))
+		{
+			Manifold = false;
+			fi= m.face.end();
+			--fi;
 		}
 	}
 
-	
+
 	if (!Manifold)
 	{
-		fprintf(index, "<p> Manifold: NO </p>"); 
+		fprintf(index, "<p> Manifold: NO </p>");
 		printf( "\t Manifold: NO\n");
 
 		/*------------XML file part ------------------*/
@@ -402,7 +381,7 @@ cout<<"Punto 7"<<endl;
 	}
 	else
 	{
-		fprintf(index, "<p> Manifold: YES </p>"); 
+		fprintf(index, "<p> Manifold: YES </p>");
 		printf( "\t Manifold: YES\n ");
 
 		/*------------XML file part ------------------*/
@@ -430,29 +409,29 @@ cout<<"Punto 7"<<endl;
 	for(fi=m.face.begin();fi!=m.face.end();fi++)
 	{
 		(*fi).SetS();
-		count_e +=3;								//assume that we have to increase the number of edges with three
+		count_e +=3; //assume that we have to increase the number of edges with three
 		for(j=0; j<3; j++)
 		{
-			if (fi->IsBorder(j))			//If this edge is a border edge
-				boundary_e++;						//  then increase the number of boundary edges
-			else if (IsManifold(*fi,j))		//If this edge is manifold
+			if (fi->IsBorder(j)) //If this edge is a border edge
+				boundary_e++; // then increase the number of boundary edges
+			else if (IsManifold(*fi,j))//If this edge is manifold
 			{
 				if((*fi).FFp(j)->IsS()) //If the face on the other side of the edge is already selected
-					count_e--;						//  we counted one edge twice
+					count_e--; // we counted one edge twice
 			}
-			else											//We have a non-manifold edge
+			else//We have a non-manifold edge
 			{
 				hei.Set(&(*fi), j , fi->V(j));
 				he=hei;
 				he.NextF();
-				while (he.f!=hei.f)			//	so we have to iterate all faces that are connected to this edge
+				while (he.f!=hei.f)// so we have to iterate all faces that are connected to this edge
 				{
-					if (he.f->IsS())			//  if one of the other faces was already visited than this edge was counted already.
+					if (he.f->IsS())// if one of the other faces was already visited than this edge was counted already.
 					{
 						counted=true;
 						break;
 					}
-					else 
+					else
 					{
 						he.NextF();
 					}
@@ -464,7 +443,7 @@ cout<<"Punto 7"<<endl;
 				}
 			}
 		}
-	}	
+	}
 	fprintf(index, "<p>Number of edges: %d </p>\n", count_e);
 	fprintf(index, "<p>Number of internal edges: %d </p>\n", count_e-boundary_e);
 	fprintf(index, "<p>Number of boundary edges: %i </p>\n", boundary_e);
@@ -477,7 +456,7 @@ cout<<"Punto 7"<<endl;
 	vn = new ValueNode;
 	en = new EntryNode;
 	osn = new OwnSlotNode;
-	sprintf(s,"%d",count_e);	
+	sprintf(s,"%d",count_e);
 	vn->setValue(s);
 	en->addValue(*vn);
 	en->type = "Integer";
@@ -504,7 +483,7 @@ cout<<"Punto 7"<<endl;
 	vn = new ValueNode;
 	en = new EntryNode;
 	osn = new OwnSlotNode;
-	sprintf(s,"%d",count_fd);	
+	sprintf(s,"%d",count_fd);
 	vn->setValue(s);
 	en->addValue(*vn);
 	en->type = "Integer";
@@ -540,7 +519,7 @@ cout<<"Punto 7"<<endl;
 	vn = new ValueNode;
 	en = new EntryNode;
 	osn = new OwnSlotNode;
-	sprintf(s,"%d",count_uv);	
+	sprintf(s,"%d",count_uv);
 	vn->setValue(s);
 	en->addValue(*vn);
 	en->type = "Integer";
@@ -548,15 +527,15 @@ cout<<"Punto 7"<<endl;
 	osn->setName("Number of unreferenced vertices");
 	osn->addEntry(*en);
 	sn->addOwnSlot(osn);
-	ng->addNode(osn);	
+	ng->addNode(osn);
 	/*--------------------------------------------*/
 
 
-	// HOLES COUNT	
+	// HOLES COUNT
 
 	int numholes=0;
 	int numholev=0;
-	int BEdges=0; 
+	int BEdges=0;
 	vector<vector<Point3x> > holes; //indices of vertices
 
 	for(fi=m.face.begin();fi!=m.face.end();++fi)
@@ -566,56 +545,56 @@ cout<<"Punto 7"<<endl;
 
 	if (Manifold)
 	{
-		for(fi=m.face.begin();fi!=m.face.end();fi++)					//for all faces do
+		for(fi=m.face.begin();fi!=m.face.end();fi++)//for all faces do
 		{
-			for(j=0;j<3;j++)										//for all edges
+			for(j=0;j<3;j++)//for all edges
 			{
 				if(fi->V(j)->IsS()) continue;
 
-				if((*fi).IsBorder(j))							//found an unvisited border edge
+				if((*fi).IsBorder(j))//found an unvisited border edge
 				{
-					he.Set(&(*fi),j,fi->V(j));			//set the face-face iterator to the current face, edge and vertex
-					vector<Point3x> hole;						//start of a new hole
-					hole.push_back(fi->P(j));				//  including the first vertex
+					he.Set(&(*fi),j,fi->V(j)); //set the face-face iterator to the current face, edge and vertex
+					vector<Point3x> hole; //start of a new hole
+					hole.push_back(fi->P(j)); // including the first vertex
 					numholev++;
-					he.v->SetS();										//set the current vertex as selected
-					he.NextB();											//go to the next boundary edge
+					he.v->SetS(); //set the current vertex as selected
+					he.NextB(); //go to the next boundary edge
 
 
-					while(fi->V(j) != he.v)					//will we do not encounter the first boundary edge.
+					while(fi->V(j) != he.v)//will we do not encounter the first boundary edge.
 					{
-						Point3x newpoint = he.v->P();		//select its vertex.
-						if(he.v->IsS())									//check if this vertex was selected already, because then we have an additional hole.
+						Point3x newpoint = he.v->P(); //select its vertex.
+						if(he.v->IsS())//check if this vertex was selected already, because then we have an additional hole.
 						{
 							//cut and paste the additional hole.
-							vector<Point3x> hole2;				
+							vector<Point3x> hole2;
 							int index = find(hole.begin(),hole.end(),newpoint) - hole.begin();
 							for(int i=index; i<hole.size(); i++)
 								hole2.push_back(hole[i]);
 
 							hole.resize(index);
-							if(hole2.size()!=0)						//annoying in degenerate cases
-								holes.push_back(hole2);							
+							if(hole2.size()!=0) //annoying in degenerate cases
+								holes.push_back(hole2);
 						}
 						hole.push_back(newpoint);
 						numholev++;
-						he.v->SetS();										//set the current vertex as selected
-						he.NextB();											//go to the next boundary edge
+						he.v->SetS(); //set the current vertex as selected
+						he.NextB(); //go to the next boundary edge
 					}
 					holes.push_back(hole);
 				}
 			}
 		}
 		numholes = holes.size();
-		fprintf(index,"<p>Number of holes/boundaries: %d </p>\n", numholes); 
-		printf("\t Number of holes/boundaries: %d \n", numholes); 
+		fprintf(index,"<p>Number of holes/boundaries: %d </p>\n", numholes);
+		printf("\t Number of holes/boundaries: %d \n", numholes);
 
 		/*------------XML file part ------------------*/
 		s = new(char[25]);
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		sprintf(s,"%d",numholes);	
+		sprintf(s,"%d",numholes);
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "Integer";
@@ -623,7 +602,7 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Number of Holes");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);	
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 
 
@@ -643,14 +622,14 @@ cout<<"Punto 7"<<endl;
 			vn = new ValueNode;
 			en = new EntryNode;
 			osn = new OwnSlotNode;
-			sprintf(s,"%d",BEdges);	
+			sprintf(s,"%d",BEdges);
 			vn->setValue(s);
 			en->addValue(*vn);
 			en->type = "Integer";
 			osn->setName("Number of Border Edges");
 			osn->addEntry(*en);
 			sn->addOwnSlot(osn);
-			ng->addNode(osn);	
+			ng->addNode(osn);
 			/*--------------------------------------------*/
 		}
 	}
@@ -671,7 +650,7 @@ cout<<"Punto 7"<<endl;
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		sprintf(s,"%f",m.Volume());	
+		sprintf(s,"%f",m.Volume());
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "Float";
@@ -679,10 +658,10 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Volume");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);	
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
-	else 
+	else
 	{
 		printf("\t Volume: UNDEFINED, mesh is either non-manifold or has holes \n");
 		fprintf(index,"Volume: UNDEFINED, mesh is either non-manifold or has holes \n");
@@ -692,18 +671,19 @@ cout<<"Punto 7"<<endl;
 	// CONNECTED COMPONENTS
 
 	vector<int> nrfaces;
+	nrfaces.reserve(1);
 	for(fi=m.face.begin();fi!=m.face.end();++fi)
 		(*fi).ClearS();
 	gi=m.face.begin(); fi=gi;
 	int Compindex=0;
-	stack<MyMesh::FaceIterator> sf;	
+	stack<MyMesh::FaceIterator> sf;
 	MyMesh::FaceType *l;
 	for(fi=m.face.begin();fi!=m.face.end();++fi)
 	{
 		if (!(*fi).IsS())
 		{
 			(*fi).SetS();
-			(*fi).Q()=Compindex;
+			//(*fi).Q()=Compindex;
 			nrfaces.push_back(1);
 			sf.push(fi);
 			while (!sf.empty())
@@ -728,15 +708,15 @@ cout<<"Punto 7"<<endl;
 		}
 	}
 	int numcomponents = nrfaces.size();
-	fprintf(index, "<p> Number of connected components: %d </p>", numcomponents); 
-	printf("\t Number of connected components: %d\n", numcomponents); 
+	fprintf(index, "<p> Number of connected components: %d </p>", numcomponents);
+	printf("\t Number of connected components: %d\n", numcomponents);
 
 	/*------------XML file part ------------------*/
 	s = new(char[25]);
 	vn = new ValueNode;
 	en = new EntryNode;
 	osn = new OwnSlotNode;
-	sprintf(s,"%d",numcomponents);	
+	sprintf(s,"%d",numcomponents);
 	vn->setValue(s);
 	en->addValue(*vn);
 	en->type = "Integer";
@@ -747,14 +727,14 @@ cout<<"Punto 7"<<endl;
 	ng->addNode(osn);
 	/*--------------------------------------------*/
 
-	//GENUS  --> 2( #components - genus ) = #vertices + #faces - #edge - #boundary_loops = eulernumber - #holes
+	//GENUS --> 2( #components - genus ) = #vertices + #faces - #edge - #boundary_loops = eulernumber - #holes
 	//eulero = (mesh.vn-count_uv) - (count_e)+mesh.fn;
 
 	int eulernumber = (m.vn-count_uv) + m.fn - count_e;
 	if(Manifold)
 	{
 		int genus = -( 0.5 * (eulernumber - numholes) - numcomponents );
-		fprintf(index, "<p> Genus: %d </p> \n ", genus); 
+		fprintf(index, "<p> Genus: %d </p> \n ", genus);
 		printf( "\t Genus: %d \n", genus);
 
 		/*------------XML file part ------------------*/
@@ -762,7 +742,7 @@ cout<<"Punto 7"<<endl;
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		sprintf(s,"%d",genus);	
+		sprintf(s,"%d",genus);
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "Integer";
@@ -770,13 +750,13 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Genus");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);	
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
-	else //(!Manifold) 
+	else//(!Manifold)
 	{
 		fprintf( index,"<p>Genus: UNDEFINED, mesh is non-manifold </p>\n");
-		printf( "Genus: UNDEFINED, mesh is non-manifold \n");
+		printf( "\t Genus: UNDEFINED, mesh is non-manifold \n");
 	}
 	// REGULARITY
 
@@ -824,15 +804,15 @@ cout<<"Punto 7"<<endl;
 
 	if (Regular)
 	{
-		fprintf(index, "<p> Type of Mesh: REGULAR</p>"); 
-		printf("\t Type of Mesh: REGULAR\n"); 
+		fprintf(index, "<p> Type of Mesh: REGULAR</p>");
+		printf("\t Type of Mesh: REGULAR\n");
 
 		/*------------XML file part ------------------*/
 		s = new(char[25]);
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		s="REGULAR";	
+		s="REGULAR";
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "String";
@@ -851,7 +831,7 @@ cout<<"Punto 7"<<endl;
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		s="SEMIREGULAR";	
+		s="SEMIREGULAR";
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "String";
@@ -859,19 +839,19 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Type of Mesh");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);		
+		ng->addNode(osn);
 	}
-	else 
+	else
 	{
-		fprintf(index, "<p> Type of Mesh: IRREGULAR</p>"); 
-		printf("\t Type of Mesh: IRREGULAR\n"); 
+		fprintf(index, "<p> Type of Mesh: IRREGULAR</p>");
+		printf("\t Type of Mesh: IRREGULAR\n");
 
 		/*------------XML file part ------------------*/
 		s = new(char[25]);
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		s="IRREGULAR";	
+		s="IRREGULAR";
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "String";
@@ -879,7 +859,7 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Type of Mesh");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);		
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
 	// ORIENTABLE E ORIENTED MESH
@@ -888,15 +868,15 @@ cout<<"Punto 7"<<endl;
 	bool Oriented=true;
 	if (!Manifold)
 	{
-		fprintf(index, "<p> Orientable Mesh: NO</p>"); 
-		printf( "\t Orientable Mesh: NO\n"); 
+		fprintf(index, "<p> Orientable Mesh: NO</p>");
+		printf( "\t Orientable Mesh: NO\n");
 
 		/*------------XML file part ------------------*/
 		s = new(char[25]);
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		s="NO";	
+		s="NO";
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "String";
@@ -904,7 +884,7 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Orientable Mesh");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);		
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
 	else
@@ -914,7 +894,7 @@ cout<<"Punto 7"<<endl;
 			(*fi).ClearS();
 			(*fi).ClearUserBit(0);
 		}
-		gi=m.face.begin(); fi=gi; 
+		gi=m.face.begin(); fi=gi;
 		for(fi=m.face.begin();fi!=m.face.end();++fi)
 		{
 			if (!(*fi).IsS())
@@ -932,11 +912,11 @@ cout<<"Punto 7"<<endl;
 						{
 							he.Set(&(*gi),0,gi->V(0));
 							l=he.f->FFp(j);
-							he.Set(&(*gi),j,gi->V(j));								
+							he.Set(&(*gi),j,gi->V(j));
 							hei.Set(he.f->FFp(j),he.f->FFi(j), (he.f->FFp(j))->V(he.f->FFi(j)));
 							if( !(*gi).IsUserBit(0) )
 							{
-								if (he.v!=hei.v)    // bene
+								if (he.v!=hei.v)// bene
 								{
 									if ((*l).IsS() && (*l).IsUserBit(0))
 									{
@@ -948,7 +928,7 @@ cout<<"Punto 7"<<endl;
 										(*l).SetS();
 										sf.push(l);
 									}
-								}	
+								}
 								else if (!(*l).IsS())
 								{
 									Oriented=false;
@@ -962,7 +942,7 @@ cout<<"Punto 7"<<endl;
 									break;
 								}
 							}
-							else if (he.v==hei.v)    // bene
+							else if (he.v==hei.v)// bene
 							{
 								if ((*l).IsS() && (*l).IsUserBit(0))
 								{
@@ -974,7 +954,7 @@ cout<<"Punto 7"<<endl;
 									(*l).SetS();
 									sf.push(l);
 								}
-							}	
+							}
 							else if (!(*l).IsS())
 							{
 								Oriented=false;
@@ -996,7 +976,7 @@ cout<<"Punto 7"<<endl;
 		}
 		if (Orientable)
 		{
-			fprintf(index, "<p> Orientable Mesh: YES</p>"); 
+			fprintf(index, "<p> Orientable Mesh: YES</p>");
 			printf( "\t Orientable Mesh: YES\n");
 
 			/*------------XML file part ------------------*/
@@ -1004,7 +984,7 @@ cout<<"Punto 7"<<endl;
 			vn = new ValueNode;
 			en = new EntryNode;
 			osn = new OwnSlotNode;
-			s="YES";	
+			s="YES";
 			vn->setValue(s);
 			en->addValue(*vn);
 			en->type = "String";
@@ -1012,12 +992,12 @@ cout<<"Punto 7"<<endl;
 			osn->setName("Orientable Mesh");
 			osn->addEntry(*en);
 			sn->addOwnSlot(osn);
-			ng->addNode(osn);	
+			ng->addNode(osn);
 			/*--------------------------------------------*/
 		}
 		else
 		{
-			fprintf(index, "<p> Orientable Mesh: NO</p>"); 
+			fprintf(index, "<p> Orientable Mesh: NO</p>");
 			printf( "\t Orientable Mesh: NO\n");
 
 			/*------------XML file part ------------------*/
@@ -1033,21 +1013,21 @@ cout<<"Punto 7"<<endl;
 			osn->setName("Orientable Mesh");
 			osn->addEntry(*en);
 			sn->addOwnSlot(osn);
-			ng->addNode(osn);	
+			ng->addNode(osn);
 			/*--------------------------------------------*/
 		}
 	}
 	if (Oriented && Manifold)
 	{
-		fprintf(index, "<p> Oriented Mesh: YES</p>"); 
-		printf( "\t Oriented Mesh: YES\n"); 
+		fprintf(index, "<p> Oriented Mesh: YES</p>");
+		printf( "\t Oriented Mesh: YES\n");
 
 		/*------------XML file part ------------------*/
 		s = new(char[25]);
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		s="YES";	
+		s="YES";
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "String";
@@ -1055,20 +1035,20 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Oriented Mesh");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);		
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
 	else
 	{
-		fprintf(index, "<p> Oriented Mesh: NO</p>"); 
-		printf( "\t Oriented Mesh: NO\n"); 
+		fprintf(index, "<p> Oriented Mesh: NO</p>");
+		printf( "\t Oriented Mesh: NO\n");
 
 		/*------------XML file part ------------------*/
 		s = new(char[25]);
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		s="NO";	
+		s="NO";
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "String";
@@ -1076,21 +1056,21 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Oriented Mesh");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);		
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
 	int dv = DuplicateVertex(m);
 	if(dv>0)
 	{
-		fprintf(index, "<p> Duplicated vertices: %d</p>", dv); 
-		printf( "\t Number of duplicated vertices found: %d\n",dv);	
+		fprintf(index, "<p> Duplicated vertices: %d</p>", dv);
+		printf( "\t Number of duplicated vertices found: %d\n",dv);
 
 		/*------------XML file part ------------------*/
 		s = new(char[25]);
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		sprintf(s,"%d",dv);	
+		sprintf(s,"%d",dv);
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "Int";
@@ -1098,12 +1078,12 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Duplicated Vertices");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);		
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
 	else
 	{
-		fprintf(index, "<p> Duplicated vertices: NO</p>"); 
+		fprintf(index, "<p> Duplicated vertices: NO</p>");
 		printf( "\t Duplicated vertices: NO\n");
 
 		/*------------XML file part ------------------*/
@@ -1111,7 +1091,7 @@ cout<<"Punto 7"<<endl;
 		vn = new ValueNode;
 		en = new EntryNode;
 		osn = new OwnSlotNode;
-		s="NO";	
+		s="NO";
 		vn->setValue(s);
 		en->addValue(*vn);
 		en->type = "String";
@@ -1119,7 +1099,7 @@ cout<<"Punto 7"<<endl;
 		osn->setName("Duplicated Vertices");
 		osn->addEntry(*en);
 		sn->addOwnSlot(osn);
-		ng->addNode(osn);	
+		ng->addNode(osn);
 		/*--------------------------------------------*/
 	}
 	// SELF INTERSECTION
@@ -1140,11 +1120,11 @@ cout<<"Punto 7"<<endl;
 				}
 			}
 			if (SelfInt)
-				break;			
+				break;
 		}
 		if (SelfInt)
 		{
-			fprintf(index, "<p> Self Intersection: YES</p>"); 
+			fprintf(index, "<p> Self Intersection: YES</p>");
 			printf( "\t Self Intersection: YES\n");
 
 			/*------------XML file part ------------------*/
@@ -1152,7 +1132,7 @@ cout<<"Punto 7"<<endl;
 			vn = new ValueNode;
 			en = new EntryNode;
 			osn = new OwnSlotNode;
-			s="YES";	
+			s="YES";
 			vn->setValue(s);
 			en->addValue(*vn);
 			en->type = "String";
@@ -1160,20 +1140,20 @@ cout<<"Punto 7"<<endl;
 			osn->setName("Self Intersection");
 			osn->addEntry(*en);
 			sn->addOwnSlot(osn);
-			ng->addNode(osn);	
+			ng->addNode(osn);
 			/*--------------------------------------------*/
 		}
 		else
 		{
-			fprintf(index, "<p> Self Intersection: NO</p>"); 
-			printf( "\t Self Intersection: NO\n"); 
+			fprintf(index, "<p> Self Intersection: NO</p>");
+			printf( "\t Self Intersection: NO\n");
 
 			/*------------XML file part ------------------*/
 			s = new(char[25]);
 			vn = new ValueNode;
 			en = new EntryNode;
 			osn = new OwnSlotNode;
-			s="NO";	
+			s="NO";
 			vn->setValue(s);
 			en->addValue(*vn);
 			en->type = "String";
@@ -1181,7 +1161,7 @@ cout<<"Punto 7"<<endl;
 			osn->setName("Self Intersection");
 			osn->addEntry(*en);
 			sn->addOwnSlot(osn);
-			ng->addNode(osn);	
+			ng->addNode(osn);
 			/*--------------------------------------------*/
 		}
 	}
@@ -1217,19 +1197,19 @@ cout<<"Punto 7"<<endl;
 	cin>>ans;
 	if((ans=="Y")||(ans=="y"))
 	{
-	/*------------XML file part ------------------*/
-	doc.addSlots(sn);
-	OwnSlotsNode* ossn = new OwnSlotsNode;
-	ossn->addOwnSlot(ng);
-	ClassNode* cn = new ClassNode;
-	cn->addOwnSlots(ossn);
-	doc.addClasses(cn);
+		/*------------XML file part ------------------*/
+		doc.addSlots(sn);
+		OwnSlotsNode* ossn = new OwnSlotsNode;
+		ossn->addOwnSlot(ng);
+		ClassNode* cn = new ClassNode;
+		cn->addOwnSlots(ossn);
+		doc.addClasses(cn);
 
-	InstanceNode*	in = new InstanceNode;
-	in->addOwnSlots(ossn);
-	doc.addInstances(in);
-	doc.finalizeMain("/",XML_SCHEMA_NAME);
-	doc.printXMLTree();
+		InstanceNode* in = new InstanceNode;
+		in->addOwnSlots(ossn);
+		doc.addInstances(in);
+		doc.finalizeMain("/",XML_SCHEMA_NAME);
+		doc.printXMLTree();
 	}
 	/*--------------------------------------------*/
 	fclose(index);