diff --git a/app.yaml b/app.yaml
index b7595031..c00e8720 100755
--- a/app.yaml
+++ b/app.yaml
@@ -2,7 +2,7 @@
 # App.yaml for the Netskrafl application on Google App Engine
 #
 application: netskrafl
-version: asterix
+version: obelix
 runtime: python27
 api_version: 1
 threadsafe: true
@@ -142,7 +142,8 @@ handlers:
 # Files that should not be uploaded to App Engine
 skip_files:
 - ^resources/.*\.txt$   # Raw text resources, such as word lists
-- ^resources/.*\.dawg$  # Compiled but not pickled DAWG trees
+- ^resources/.*\.text\.dawg$   # DAWG trees in text form
+- ^resources/.*\.dawg\.pickle$ # DAWG trees in pickled form
 - ^(.*/)?.*\.psd$       # Photoshop files
 - ^(.*/)?.*\.ai$        # Illustrator files
 - ^(.*/)?.*\.log$       # Local log files
diff --git a/dawgtester.py b/dawgtester.py
index fb955787..ea91f5f0 100755
--- a/dawgtester.py
+++ b/dawgtester.py
@@ -80,9 +80,13 @@ def run(self, fname, relpath):
         self._test_true(u"drenið")
         self._test_true(u"drensins")
         self._test_true(u"álínis")
+        self._test_true(u"hán")
+        self._test_true(u"háni")
+        self._test_true(u"háns")
         self._test_false(u"réttleganna")
         self._test_false(u"meistarleganna")
         self._test_false(u"hjálpsamligana")
+        self._test_false(u"ennig")
 
         self._test_true(u"bitla")
         self._test_true(u"friðla")
@@ -164,12 +168,29 @@ def run(self, fname, relpath):
         self._test_false(u"þarftðu")
         self._test_false(u"þurreystðu")
 
+        # Spurnarmyndir (question forms)
+        # Allowed in singular (present and past tense),
+        # disallowed in plural (present and past tense)
         self._test_true(u"ertu")
         self._test_true(u"vertu")
         self._test_true(u"sértu")
         self._test_true(u"varstu")
         self._test_true(u"verðurðu")
         self._test_true(u"varðstu")
+        self._test_true(u"fórstu")
+        self._test_true(u"ferðu")
+        self._test_true(u"komstu")
+        self._test_true(u"kemurðu")
+        self._test_true(u"borðarðu")
+        self._test_true(u"borðaðirðu")
+        self._test_false(u"voruði")
+        self._test_false(u"eruði")
+        self._test_false(u"fóruði")
+        self._test_false(u"fariði")
+        self._test_false(u"borðiði")
+        self._test_false(u"borðuðuði")
+        self._test_false(u"komiði")
+        self._test_false(u"komuði")
 
         # All two-letter words on the official list of the
         # Icelandic Skrafl society
diff --git a/netskrafl.py b/netskrafl.py
index d869f3cf..eccd10ec 100755
--- a/netskrafl.py
+++ b/netskrafl.py
@@ -698,6 +698,12 @@ def start():
     return "", 200 # jsonify(ok = ok)
 
 
+@app.route("/_ah/stop")
+def stop():
+    """ App Engine is stopping an instance """
+    return "", 200
+
+
 @app.route("/_ah/warmup")
 def warmup():
     """ App Engine is starting a fresh instance - warm it up by loading word database """