diff --git a/src/sgfParser/collection.py b/src/sgfParser/collection.py
old mode 100755
new mode 100644
--- a/src/sgfParser/collection.py
+++ b/src/sgfParser/collection.py
@@ -1,5 +1,6 @@
 from .node import Node
 from . import skipWhitespace, ParserError
+from gameRecord import GameRecord
 
 
 class Collection:
@@ -43,7 +44,7 @@ class GameTree:
 			i,x=Node.create(s,i)
 			res.nodes.append(x)
 			if y: y.addChild(x)
-			x.setParent(y)
+			x.parent=y
 			y=x
 			i=skipWhitespace(s,i)
 
@@ -51,7 +52,7 @@ class GameTree:
 			i,x=GameTree.create(s,i)
 			res.branches.append(x)
 			subroot=x.getNode(0)
-			subroot.setParent(y)
+			subroot.parent=y
 			if y: y.addChild(subroot)
 			i=skipWhitespace(s,i)
 		if i>=len(s) or s[i]!=")":
@@ -61,8 +62,9 @@ class GameTree:
 
 	## Expand multiple games into distinct GameTrees and yield each.
 	def listGames(self):
-		for node in self._listGINodes():
-			yield self._buildSubtree(node)
+		if len(self.nodes)==0: return None
+		for node in self.nodes[0].listGINodes():
+			yield GameRecord(self._buildSubtree(node))
 
 	def getNode(self,i):
 		if 0<=i<len(self.nodes):
@@ -71,23 +73,15 @@ class GameTree:
 
 	## Create and return a new game tree containing the provided Node.
 	#
-	# Ancestor nodes are copied, descendants are shared.
+	# Ancestor nodes are copied, descendants are moved from the seedNode.
 	def _buildSubtree(self,seedNode):
 		node=seedNode.copy()
+		node.setChildren(seedNode.children)
+		seedNode.children=[]
 
 		while node.parent:
 			newNode=node.parent.copy()
-			node.parent=newNode
-			newNode.setChildren([node])
+			newNode.addChild(node)
 			node=newNode
 
 		return node
-
-	## Find and yield Game Info nodes.
-	def _listGINodes(self):
-		for node in self.nodes:
-			if node.isGINode():
-				yield node
-		for tree in self.branches:
-			for node in tree._listGINodes():
-				yield node