diff --git a/ChangeLog b/ChangeLog
index c1b2f695c..3ae2a8e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-16  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/ReadGedcom.py: allow default when selecting override, add
+	the place properly on import
+	* src/gedcomimport.glade: allow default when selecting override
+	* src/gramps_main.py: don't lose track of active person after
+	a cancelled Add Person
+
 2004-10-15  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/GrampsBSDDB.py: increase cachesize
 	* src/ReadGedcom.py: increment source count
diff --git a/src/EditPerson.py b/src/EditPerson.py
index 7e4fba85b..742e26f39 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -919,8 +919,9 @@ class EditPerson:
         for event_handle in self.elist:
             event = self.db.get_event_from_handle(event_handle)
             pname = place_title(self.db,event)
-            node = self.etree.add([const.display_pevent(event.get_name()),event.get_description(),
-                                    event.get_quote_date(),pname],event)
+            node = self.etree.add([const.display_pevent(event.get_name()),
+                                   event.get_description(),
+                                   event.get_quote_date(),pname],event)
             self.emap[str(event)] = node
         if self.elist:
             self.etree.select_row(0)
diff --git a/src/ReadGedcom.py b/src/ReadGedcom.py
index 299f6b050..e4237558e 100644
--- a/src/ReadGedcom.py
+++ b/src/ReadGedcom.py
@@ -259,12 +259,12 @@ class GedcomParser:
         self.filename = file
         self.index = 0
         self.backoff = 0
-        self.override = codeset != None
+        self.override = codeset
 
-        if self.override:
-            if self.override == 0:
+        if self.override != 0:
+            if self.override == 1:
                 self.cnv = ansel_to_utf8
-            elif self.override == 1:
+            elif self.override == 2:
                 self.cnv = latin_utf8.latin_to_utf8
             else:
                 self.cnv = nocnv
@@ -640,6 +640,7 @@ class GedcomParser:
             place.set_handle(intid)
             place.set_title(gramps_id)
             place.set_gramps_id(self.db.find_next_place_gramps_id())
+            self.db.add_place(place,self.trans)
             self.lid2id[gramps_id] = intid
         return place
 
diff --git a/src/gedcomimport.glade b/src/gedcomimport.glade
index 7ee0af729..e1964e49b 100644
--- a/src/gedcomimport.glade
+++ b/src/gedcomimport.glade
@@ -692,7 +692,8 @@
 		  <child>
 		    <widget class="GtkComboBox" id="codeset">
 		      <property name="visible">True</property>
-		      <property name="items" translatable="yes">ANSEL
+		      <property name="items" translatable="yes">default
+ANSEL
 ANSI (iso-8859-1)
 ASCII
 UNICODE</property>
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 96412f5aa..1174a6438 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -1174,9 +1174,9 @@ class Gramps:
         self.people_view.add_to_person_list(person,0)
     
     def load_new_person(self,obj):
-        self.active_person = RelLib.Person()
+        person = RelLib.Person()
         try:
-            EditPerson.EditPerson(self,self.active_person,self.db,
+            EditPerson.EditPerson(self,person,self.db,
                                   self.update_after_edit)
         except:
             DisplayTrace.DisplayTrace()
@@ -1438,6 +1438,7 @@ class Gramps:
             self.place_view.new_place_after_edit(p)
 
     def update_after_edit(self,epo,change=1):
+        self.active_person = epo.person
         if change:
             self.people_view.update_person_list(epo.person)
         else: