diff --git a/anki/cards.py b/anki/cards.py
index 278db9ec8..18bf8ac18 100644
--- a/anki/cards.py
+++ b/anki/cards.py
@@ -99,8 +99,8 @@ streak=?, lapses=?, grade=?, cycles=?, edue=? where id = ?""",
             self.factor, self.reps, self.streak, self.lapses,
             self.grade, self.cycles, self.edue, self.id)
 
-    def q(self, classes="q"):
-        return self._withClass(self._getQA()['q'], classes)
+    def q(self, classes="q", reload=False):
+        return self._withClass(self._getQA(reload)['q'], classes)
 
     def a(self, classes="a"):
         return self._withClass(self._getQA()['a'], classes)
diff --git a/anki/models.py b/anki/models.py
index 03c1a89c8..af979817a 100644
--- a/anki/models.py
+++ b/anki/models.py
@@ -70,13 +70,14 @@ select mod, name, flds, tmpls, conf, css from models where id = ?""", self.id)
 
     def flush(self):
         self.mod = intTime()
+        self.css = self.genCSS()
         ret = self.deck.db.execute("""
 insert or replace into models values (?, ?, ?, ?, ?, ?, ?)""",
                 self.id, self.mod, self.name,
                 simplejson.dumps(self.fields),
                 simplejson.dumps(self.templates),
                 simplejson.dumps(self.conf),
-                self.genCSS())
+                self.css)
         self.id = ret.lastrowid
 
     def fids(self):
diff --git a/anki/sched.py b/anki/sched.py
index f7bb69cec..2a1f7e539 100644
--- a/anki/sched.py
+++ b/anki/sched.py
@@ -447,7 +447,6 @@ queue = 2 %s and due <= :lim order by %s limit %d""" % (
         self._updateRevIvl(card, ease)
         # then the rest
         card.factor = max(1300, card.factor+[-150, 0, 150][ease-2])
-        print "fixme: ensure ivl is 1+ current"
         card.due = self.today + card.ivl
 
     def _logRev(self, card, ease):