diff --git a/src/cli/arghandler.py b/src/cli/arghandler.py
index a5f83be56..f5be78ef5 100644
--- a/src/cli/arghandler.py
+++ b/src/cli/arghandler.py
@@ -329,7 +329,7 @@ class ArgHandler(object):
         """
         Take action for all given to import files. Note: Family trees are not
             supported.
-        If a fam tree is open, the import happens on top of it. If not open, 
+        If a family tree is open, the import happens on top of it. If not open, 
         a new family tree is created, and the import done. If this is CLI, 
         the created tree is deleted at the end (as some action will have 
         happened that is now finished), if this is GUI, it is opened.
@@ -349,7 +349,7 @@ class ArgHandler(object):
                 
                 try:
                     self.sm.open_activate(self.imp_db_path)
-                    print "Created empty fam tree successfully"
+                    print "Created empty family tree successfully"
                 except:
                     print "Error opening the file." 
                     print "Exiting..." 
@@ -361,8 +361,8 @@ class ArgHandler(object):
 
     def __open_action(self):
         """
-        Take action on a Fam tree dir to open. It will be opened in the 
-        sessionmanager
+        Take action on a family tree dir to open. It will be opened in the 
+        session manager
         """
         if self.open:
             # Family Tree to open was given. Open it 
diff --git a/src/gui/dbman.py b/src/gui/dbman.py
index 2a65153ee..cf2b9f9c7 100644
--- a/src/gui/dbman.py
+++ b/src/gui/dbman.py
@@ -67,14 +67,11 @@ import pango
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import const
 from QuestionDialog import ErrorDialog, QuestionDialog
-import gen.db
+from gen.db import GrampsDBDir
 from gen.plug import PluginManager
-from cli.clidbman import *
+from cli.clidbman import CLIDbManager, NAME_FILE, time_val
 import GrampsDbUtils
-import Config
-import Mime
 from DdTargets import DdTargets
 import RecentFiles
 from glade import Glade
@@ -278,7 +275,7 @@ class DbManager(CLIDbManager):
                                          stock_id=STOCK_COL)
         self.dblist.append_column(icon_column)
 
-        # build the last modified cocolumn
+        # build the last modified column
         render = gtk.CellRendererText()
         column = gtk.TreeViewColumn(_('Last modified'), render, text=DATE_COL)
         column.set_sort_column_id(DSORT_COL)
@@ -511,7 +508,7 @@ class DbManager(CLIDbManager):
         new_path, newname = self._create_new_db("%s : %s" % (parent_name, name))
         
         self.__start_cursor(_("Extracting archive..."))
-        dbclass = gen.db.GrampsDBDir
+        dbclass = GrampsDBDir
         dbase = dbclass()
         dbase.load(new_path, None)
         
@@ -635,10 +632,10 @@ class DbManager(CLIDbManager):
                 fname = os.path.join(dirname, filename)
                 os.unlink(fname)
 
-        newdb = gen.db.GrampsDBDir()
+        newdb = GrampsDBDir()
         newdb.write_version(dirname)
 
-        dbclass = gen.db.GrampsDBDir
+        dbclass = GrampsDBDir
         dbase = dbclass()
         dbase.set_save_path(dirname)
         dbase.load(dirname, None)