diff --git a/src/Date.py b/src/Date.py
index 3c0028611..714f0400c 100644
--- a/src/Date.py
+++ b/src/Date.py
@@ -314,6 +314,9 @@ class SingleDate:
         _("aft")    : after,
             # And the untranslated versions for reading saved data from XML.
         "abt"	: about,        "about"	: about,
+        "bef"   : before,       "bef."  : before,
+        "aft."  : after,        "abt."  : about,
+        "est."  : about,        "est"   : about,
         "after"	: after,        "before": before
         }
 
@@ -358,7 +361,10 @@ class SingleDate:
         if val == None:
             self.mode = SingleDate.exact
         else:
-            self.mode = SingleDate.m2v[string.lower(val)]
+            try:
+                self.mode = SingleDate.m2v[string.lower(val)]
+            except KeyError:
+                raise Date.Error,val
 
     def setMonth(self,val):
         if val > 12 or val < 0:
diff --git a/src/EditPerson.glade b/src/EditPerson.glade
index fcacb134c..897cefcca 100644
--- a/src/EditPerson.glade
+++ b/src/EditPerson.glade
@@ -2204,6 +2204,7 @@
 	      <signal>
 		<name>select_row</name>
 		<handler>on_event_select_row</handler>
+		<after>True</after>
 		<last_modification_time>Fri, 01 Dec 2000 02:58:20 GMT</last_modification_time>
 	      </signal>
 	      <signal>