diff --git a/plugins/Factoids/plugin.py b/plugins/Factoids/plugin.py
index 6b383a079..730cfb4aa 100644
--- a/plugins/Factoids/plugin.py
+++ b/plugins/Factoids/plugin.py
@@ -64,7 +64,13 @@ def getFactoid(irc, msg, args, state):
     state.args.append(' '.join(key))
     state.args.append(' '.join(value))
 
+def getFactoidId(irc, msg, args, state):
+    Type = 'key id'
+    p = lambda i: i > 0
+    callConverter('int', irc, msg, args, state, Type, p)
+
 addConverter('factoid', getFactoid)
+addConverter('factoidId', getFactoidId)
 
 class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
     def makeDb(self, filename):
@@ -133,7 +139,8 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
                           LIMIT 20""", key)
         return [t[0] for t in cursor.fetchall()]
 
-    def _replyFactoids(self, irc, channel, key, factoids, number=0, error=True):
+    def _replyFactoids(self, irc, channel, key, factoids,
+                       number=0, error=True):
         if factoids:
             if number:
                 try:
@@ -157,7 +164,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
         elif error:
             irc.error('No factoid matches that key.')
 
-    def tokenizedCommand(self, irc, msg, tokens):
+    def invalidCommand(self, irc, msg, tokens):
         if irc.isChannel(msg.args[0]):
             channel = msg.args[0]
             if self.registryValue('replyWhenInvalidCommand', channel):
@@ -174,7 +181,8 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
         """
         factoids = self._lookupFactoid(channel, key)
         self._replyFactoids(irc, channel, key, factoids, number)
-    whatis = wrap(whatis, ['channel', reverse(optional('int', 0)), 'text'])
+    whatis = wrap(whatis, ['channel',
+                           reverse(optional('factoidId', 0)), 'text'])
 
     def lock(self, irc, msg, args, channel, key):
         """[<channel>] <key>
@@ -233,7 +241,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
             if number is not None:
                 results = cursor.fetchall()
                 try:
-                    (_, id) = results[number]
+                    (_, id) = results[number-1]
                 except IndexError:
                     irc.error('Invalid factoid number.')
                     return
@@ -247,7 +255,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
                           cursor.rowcount)
     forget = wrap(forget, ['channel',
                            reverse(optional(first(('literal', '*'),
-                                                  'id'))),
+                                                  'factoidId'))),
                            'text'])
 
     def random(self, irc, msg, args, channel):
@@ -328,7 +336,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
         db.commit()
         irc.replySuccess()
     change = wrap(change, ['channel', 'something',
-                           ('id', 'key id'), 'regexpReplacer'])
+                           'factoidId', 'regexpReplacer'])
 
     _sqlTrans = string.maketrans('*?', '%_')
     def search(self, irc, msg, args, channel, optlist, globs):
diff --git a/plugins/Factoids/test.py b/plugins/Factoids/test.py
index a5dc424d6..528eb9daa 100644
--- a/plugins/Factoids/test.py
+++ b/plugins/Factoids/test.py
@@ -127,16 +127,18 @@ if sqlite:
             self.assertError('learn foo is bar')
             self.assertNotError('learn foo as bar')
             self.assertRegexp('whatis foo', 'bar')
+            orig = conf.supybot.plugins.Factoids.learnSeparator()
             try:
                 conf.supybot.plugins.Factoids.learnSeparator.setValue('is')
                 self.assertError('learn bar as baz')
                 self.assertNotError('learn bar is baz')
                 self.assertRegexp('whatis bar', 'baz')
             finally:
-                conf.supybot.plugins.Factoids.learnSeparator.setValue('as')
+                conf.supybot.plugins.Factoids.learnSeparator.setValue(orig)
 
         def testShowFactoidIfOnlyOneMatch(self):
             m1 = self.assertNotError('factoids search m/foo|bar/')
+            orig = conf.supybot.plugins.Factoids.showFactoidIfOnlyOneMatch()
             try:
                 conf.supybot.plugins.Factoids. \
                     showFactoidIfOnlyOneMatch.setValue(False)
@@ -144,11 +146,18 @@ if sqlite:
                 self.failUnless(m1.args[1].startswith(m2.args[1]))
             finally:
                 conf.supybot.plugins.Factoids. \
-                    showFactoidIfOnlyOneMatch.setValue(True)
+                    showFactoidIfOnlyOneMatch.setValue(orig)
 
         def testInvalidCommand(self):
-            self.assertNotError('learn foo as bar')
-            self.assertRegexp('foo', 'bar')
+            orig = conf.supybot.plugins.Factoids.replyWhenInvalidCommand()
+            try:
+                conf.supybot.plugins.Factoids.\
+                    replyWhenInvalidCommand.setValue(True)
+                self.assertNotError('learn foo as bar')
+                self.assertRegexp('foo', 'bar')
+            finally:
+                conf.supybot.plugins.Factoids.\
+                    replyWhenInvalidCommand.setValue(orig)
 
 
 # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: