diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index eae8f26..07fa458 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -67,6 +67,7 @@ const char* StrPair::GetStr()
 				else {
 					*q = *p;
 					++p;
+					++q;
 				}
 			}
 		}
@@ -89,8 +90,9 @@ char* XMLBase::ParseText( char* p, StrPair* pair, const char* endTag )
 	while ( *p ) {
 		if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) {
 			pair->Set( start, p, StrPair::NEEDS_ENTITY_PROCESSING | StrPair::NEEDS_NEWLINE_NORMALIZATION );
-			break;
+			return p + length;
 		}
+		++p;
 	}	
 	return p;
 }
@@ -99,7 +101,6 @@ char* XMLBase::ParseText( char* p, StrPair* pair, const char* endTag )
 char* XMLBase::ParseName( char* p, StrPair* pair )
 {
 	char* start = p;
-	char* nextTag = 0;
 
 	start = p;
 	if ( !start || !(*start) ) {
@@ -273,7 +274,7 @@ XMLComment::~XMLComment()
 void XMLComment::Print( FILE* fp, int depth )
 {
 	XMLNode::Print( fp, depth );
-	fprintf( fp, "<!--%s-->\n", value );
+	fprintf( fp, "<!--%s-->\n", value.GetStr() );
 }
 
 
@@ -425,11 +426,11 @@ void XMLElement::Print( FILE* cfile, int depth )
 	}
 
 	if ( firstChild ) {
-		fprintf( cfile, ">/n" );
+		fprintf( cfile, ">\n" );
 		for( XMLNode* node=firstChild; node; node=node->next ) {
 			node->Print( cfile, depth+1 );
 		}
-		fprintf( cfile, "</%s>", Name() );
+		fprintf( cfile, "</%s>\n", Name() );
 	}
 	else {
 		fprintf( cfile, "/>\n" );
@@ -459,10 +460,13 @@ bool XMLDocument::Parse( const char* p )
 	XMLNode* node = 0;
 	
 	char* q = Identify( this, charBuffer->mem, &node );
-	if ( node ) {
+	while ( node ) {
 		root->InsertEndChild( node );
-		node->ParseDeep( q );
-		return true;
+		q = node->ParseDeep( q );
+		node = 0;
+		if ( q && *q ) {
+			q = Identify( this, q, &node );
+		}
 	}
 	return false;
 }
diff --git a/tinyxml2.suo b/tinyxml2.suo
index 77d44eb..62101d6 100644
Binary files a/tinyxml2.suo and b/tinyxml2.suo differ
diff --git a/xmltest.cpp b/xmltest.cpp
index a1d52a5..322d25c 100644
--- a/xmltest.cpp
+++ b/xmltest.cpp
@@ -28,15 +28,20 @@ int main( int argc, const char* argv )
 	}
 #endif
 	{
-		static const char* test[] = {	//"<element />",
-									   // "<element></element>",
+		static const char* test[] = {	"<!--single element-->",
+										"<element />",
+									    "<element></element>",
+										"<!--single sub-element-->",
 									    "<element><subelement/></element>",
+									    "<element><subelement></subelement></element>",
+									    "<!--comment beside elements--><element><subelement></subelement></element>",
 										0
 		};
 		for( int i=0; test[i]; ++i ) {
 			XMLDocument doc;
 			doc.Parse( test[i] );
 			doc.Print( stdout );
+			printf( "----------------------------------------------\n" );
 		}
 	}
 	return 0;