diff --git a/ChangeLog b/ChangeLog
index 856ea0ea3..55ff49176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-17  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/EditPerson.py: saving grouping name, instead of surname for
+	updating of the person list
+	* src/ReadGedcom.py: save person and source as soon as created
+	* src/gramps_main.py: compare updates based off grouping name 
+	instead of surname
+
 2004-10-17 Julio Sanchez <julio.sanchez@gmail.com>
 	* src/plugins/rel_es.py: Correct levels.
 
diff --git a/src/EditPerson.py b/src/EditPerson.py
index 742e26f39..103be6f33 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -104,7 +104,7 @@ class EditPerson:
         self.dp = DateHandler.create_parser()
         self.dd = DateHandler.create_display()
         self.person = person
-        self.orig_surname = person.get_primary_name().get_surname()
+        self.orig_surname = person.get_primary_name().get_group_name()
         self.parent = parent
         self.orig_handle = self.person.get_handle()
         if self.parent.child_windows.has_key(self.orig_handle):
diff --git a/src/MediaView.py b/src/MediaView.py
index c8d781a26..72fb16ab0 100644
--- a/src/MediaView.py
+++ b/src/MediaView.py
@@ -77,6 +77,7 @@ class MediaView:
         self.parent = parent
         self.db = db
         self.list = glade.get_widget("media_list")
+        #self.list.set_property('fixed-height-mode',True)
         self.mid = glade.get_widget("mid")
         self.mtype = glade.get_widget("mtype")
         self.mdesc = glade.get_widget("mdesc")
diff --git a/src/PeopleView.py b/src/PeopleView.py
index 49e5deede..5a1434caa 100644
--- a/src/PeopleView.py
+++ b/src/PeopleView.py
@@ -80,6 +80,7 @@ class PeopleView:
 
         self.columns = []
         self.build_columns()
+        #self.person_tree.set_property('fixed-height-mode',True)
         self.person_selection = self.person_tree.get_selection()
         self.person_selection.connect('changed',self.row_changed)
         self.person_tree.connect('row_activated', self.alpha_event)
diff --git a/src/PlaceView.py b/src/PlaceView.py
index 43c427b9d..aa03a03fb 100644
--- a/src/PlaceView.py
+++ b/src/PlaceView.py
@@ -71,6 +71,7 @@ class PlaceView:
         self.parent = parent
         self.glade  = glade
         self.list   = glade.get_widget("place_list")
+        #self.list.set_property('fixed-height-mode',True)
         self.list.connect('button-press-event',self.button_press)
         self.list.connect('key-press-event',self.key_press)
         self.selection = self.list.get_selection()
diff --git a/src/ReadGedcom.py b/src/ReadGedcom.py
index e4237558e..0d62d36d3 100644
--- a/src/ReadGedcom.py
+++ b/src/ReadGedcom.py
@@ -615,6 +615,7 @@ class GedcomParser:
             intid = Utils.create_id()
             person.set_handle(intid)
             person.set_gramps_id(gramps_id)
+            self.db.add_person(person,self.trans)
             self.gid2id[gramps_id] = intid
         return person
 
@@ -627,6 +628,7 @@ class GedcomParser:
             intid = Utils.create_id()
             source.set_handle(intid)
             source.set_gramps_id(gramps_id)
+            self.db.add_source(source,self.trans)
             self.sid2id[gramps_id] = intid
         return source
 
diff --git a/src/SourceView.py b/src/SourceView.py
index 15fc0b0b4..8efaa9625 100644
--- a/src/SourceView.py
+++ b/src/SourceView.py
@@ -70,6 +70,7 @@ class SourceView:
         self.glade = glade
         self.update = update
         self.list = glade.get_widget("source_list")
+        #self.list.set_property('fixed-height-mode',True)
         self.list.connect('button-press-event',self.button_press)        
         self.selection = self.list.get_selection()
 
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 6102bcab3..805bc3568 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -1439,7 +1439,11 @@ class Gramps:
 
     def update_after_edit(self,epo,change=1):
         self.active_person = epo.person
-        if epo.orig_surname != self.active_person.get_primary_name().get_surname():
+        pn = self.active_person.get_primary_name()
+
+        mapname = self.db.get_name_group_mapping(pn.get_group_name())
+
+        if epo.orig_surname != pn.get_group_name() or epo.orig_surname != mapname:
             self.people_view.build_tree()
         elif change:
             self.people_view.update_person_list(epo.person)