diff --git a/gramps2/src/AutoComp.py b/gramps2/src/AutoComp.py
index f47614f65..e78ee6742 100644
--- a/gramps2/src/AutoComp.py
+++ b/gramps2/src/AutoComp.py
@@ -59,6 +59,7 @@ def fill_combo(combo,data_list):
 
 def fill_entry(entry,data_list):
     store = gtk.ListStore(str)
+
     for data in data_list:
         if data:
             store.append(row=[data])
diff --git a/gramps2/src/Editors/_EditLdsOrd.py b/gramps2/src/Editors/_EditLdsOrd.py
index 9e5897f13..e771744a9 100644
--- a/gramps2/src/Editors/_EditLdsOrd.py
+++ b/gramps2/src/Editors/_EditLdsOrd.py
@@ -109,6 +109,15 @@ class EditLdsOrd(EditSecondary):
             self.dbstate.get_place_completion(),
             self.db.readonly)
 
+        self.type_menu = MonitoredMenu(
+            self.top.get_widget('type'),
+            self.obj.set_type,
+            self.obj.get_type,
+            [(_('Baptism'),RelLib.LdsOrd.BAPTISM),
+             (_('Endowment'),RelLib.LdsOrd.ENDOWMENT),
+             (_('Sealed to Parents'),RelLib.LdsOrd.SEAL_TO_PARENTS)],
+            self.db.readonly)
+
         temple_list = []
         for val in lds.temple_codes.keys():
             temple_list.append((lds.temple_codes[val],val))
diff --git a/gramps2/src/Editors/_EditName.py b/gramps2/src/Editors/_EditName.py
index 5c62c3265..51f597c74 100644
--- a/gramps2/src/Editors/_EditName.py
+++ b/gramps2/src/Editors/_EditName.py
@@ -87,24 +87,28 @@ class EditName(EditSecondary):
 
     def _setup_fields(self):
         self.group_as = MonitoredEntry(
-            self.top.get_widget("group_as"), self.obj.set_group_as,
-            self.obj.get_group_as, self.db.readonly)
+            self.top.get_widget("group_as"),
+            self.obj.set_group_as,
+            self.obj.get_group_as,
+            self.db.readonly)
 
         if not self.original_group_as:
             self.group_as.force_value(self.obj.get_surname())
             
         self.sort_as = MonitoredMenu(
-            self.top.get_widget('sort_as'),self.obj.set_sort_as,
+            self.top.get_widget('sort_as'),
+            self.obj.set_sort_as,
             self.obj.get_sort_as,
-            [(_('Default (based on locale'),RelLib.Name.DEF),
+            [(_('Default (based on locale)'),RelLib.Name.DEF),
              (_('Given name Family name'), RelLib.Name.FNLN),
              (_('Family name Given Name'), RelLib.Name.LNFN)],
             self.db.readonly)
 
         self.display_as = MonitoredMenu(
             self.top.get_widget('display_as'),
-            self.obj.set_display_as, self.obj.get_display_as,
-            [(_('Default (based on locale'),RelLib.Name.DEF),
+            self.obj.set_display_as,
+            self.obj.get_display_as,
+            [(_('Default (based on locale)'),RelLib.Name.DEF),
              (_('Given name Family name'), RelLib.Name.FNLN),
              (_('Family name Given Name'), RelLib.Name.LNFN)],
             self.db.readonly)
@@ -126,9 +130,11 @@ class EditName(EditSecondary):
             self.obj.get_patronymic, self.db.readonly)
 
         self.surname_field = MonitoredEntry(
-            self.top.get_widget("alt_surname"), self.obj.set_surname,
-            self.obj.get_surname, self.db.readonly,
-            self.update_group_as)
+            self.top.get_widget("alt_surname"),
+            self.obj.set_surname,
+            self.obj.get_surname,
+            self.db.readonly,
+            changed=self.update_group_as)
 
         self.prefix_field = MonitoredEntry(
             self.top.get_widget("alt_prefix"), self.obj.set_surname_prefix,