diff --git a/aqt/addcards.py b/aqt/addcards.py
index 0bf8a52f3..dc966e9be 100644
--- a/aqt/addcards.py
+++ b/aqt/addcards.py
@@ -93,9 +93,9 @@ class AddCards(QDialog):
         # copy fields from old fact
         if oldFact:
             self.removeTempFact(oldFact)
-            for n in range(len(fact._fields)):
+            for n in range(len(fact.fields)):
                 try:
-                    fact._fields[n] = oldFact._fields[n]
+                    fact.fields[n] = oldFact.fields[n]
                 except IndexError:
                     break
         self.editor.setFact(fact)
@@ -107,7 +107,7 @@ class AddCards(QDialog):
         self.mw.deck._delFacts([fact.id])
 
     def addHistory(self, fact):
-        txt = stripHTMLMedia(",".join(fact._fields))[:30]
+        txt = stripHTMLMedia(",".join(fact.fields))[:30]
         self.history.append((fact.id, txt))
         self.history = self.history[-15:]
         self.historyButton.setEnabled(True)
diff --git a/aqt/browser.py b/aqt/browser.py
index b4348fb7b..4a67a6965 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -195,7 +195,7 @@ class DeckModel(QAbstractTableModel):
             return self.formatQA(c.a())
         elif type == "factFld":
             f = c.fact()
-            return self.formatQA(f._fields[f.model().sortIdx()])
+            return self.formatQA(f.fields[f.model().sortIdx()])
         elif type == "template":
             return c.template()['name']
         elif type == "cardDue":
diff --git a/aqt/editor.py b/aqt/editor.py
index d5c9646a9..459232326 100644
--- a/aqt/editor.py
+++ b/aqt/editor.py
@@ -311,7 +311,7 @@ class Editor(object):
         # focus lost or key/button pressed?
         if str.startswith("blur") or str.startswith("key"):
             (type, txt) = str.split(":", 1)
-            self.fact._fields[self.currentField] = self.mungeHTML(txt)
+            self.fact.fields[self.currentField] = self.mungeHTML(txt)
             if type == "blur":
                 if not self._keepButtons:
                     self.disableButtons()
@@ -405,7 +405,7 @@ class Editor(object):
     def fieldsAreBlank(self):
         if not self.fact:
             return True
-        for f in self.fact._fields:
+        for f in self.fact.fields:
             if f:
                 return False
         return True
@@ -420,10 +420,10 @@ class Editor(object):
         form.setupUi(d)
         d.connect(form.buttonBox, SIGNAL("helpRequested()"),
                  lambda: aqt.openHelp("HtmlEditor"))
-        form.textEdit.setPlainText(self.fact._fields[self.currentField])
+        form.textEdit.setPlainText(self.fact.fields[self.currentField])
         form.textEdit.moveCursor(QTextCursor.End)
         d.exec_()
-        self.fact._fields[self.currentField] = unicode(
+        self.fact.fields[self.currentField] = unicode(
             form.textEdit.toPlainText())
         self.loadFact(self.currentField)
 
@@ -503,7 +503,7 @@ class Editor(object):
             showInfo(_("Please add a cloze deletion model."),
                  help="ClozeDeletion")
             return
-        f = self.fact._fields[self.currentField]
+        f = self.fact.fields[self.currentField]
         # find the highest existing cloze
         m = re.findall("\{\{c(\d+)::", f)
         if m:
diff --git a/aqt/main.py b/aqt/main.py
index 4934a22c0..9fba5d236 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -238,7 +238,7 @@ title="%s">%s</button>''' % (
     def onUpgrade(self, db):
         self.upgrading = True
         self.progress.setupDB(db)
-        self.progress.start(label=_("Upgrading..."))
+        self.progress.start(label=_("Upgrading. Please be patient..."))
 
     # Deck loading
     ##########################################################################
diff --git a/aqt/progress.py b/aqt/progress.py
index 64fc50cb7..322d8af10 100644
--- a/aqt/progress.py
+++ b/aqt/progress.py
@@ -6,6 +6,10 @@ import time
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
+# fixme: if mw->subwindow opens a progress dialog with mw as the parent, mw
+# gets raised on finish on compiz. perhaps we should be using the progress
+# dialog as the parent?
+
 # Progress info
 ##########################################################################
 
diff --git a/aqt/reviewer.py b/aqt/reviewer.py
index 636056ce9..37393d798 100644
--- a/aqt/reviewer.py
+++ b/aqt/reviewer.py
@@ -378,7 +378,7 @@ div#filler {
         ord = self.typeAns()
         try:
             cor = self.mw.deck.media.strip(
-                stripHTML(self.card.fact()._fields[ord]))
+                stripHTML(self.card.fact().fields[ord]))
         except IndexError:
             self.card.template()['typeAns'] = None
             self.card.model().flush()