diff --git a/dosagelib/helpers.py b/dosagelib/helpers.py
index 9e35a4da1..209d36764 100644
--- a/dosagelib/helpers.py
+++ b/dosagelib/helpers.py
@@ -24,17 +24,17 @@ def regexNamer(regex):
     return _namer
 
 
-def bounceStarter(latestUrl, nextSearch):
+def bounceStarter(url, nextSearch):
     """Get start URL by "bouncing" back and forth one time."""
     @classmethod
     def _starter(cls):
         """Get bounced start URL."""
-        url = fetchUrl(latestUrl, cls.prevSearch, session=cls.session)
-        if not url:
-            raise ValueError("could not find prevSearch pattern %r in %s" % (cls.prevSearch.pattern, latestUrl))
-        url2 = fetchUrl(url, nextSearch, session=cls.session)
+        url1 = fetchUrl(url, cls.prevSearch, session=cls.session)
+        if not url1:
+            raise ValueError("could not find prevSearch pattern %r in %s" % (cls.prevSearch.pattern, url))
+        url2 = fetchUrl(url1, nextSearch, session=cls.session)
         if not url2:
-            raise ValueError("could not find nextSearch pattern %r in %s" % (nextSearch.pattern, url))
+            raise ValueError("could not find nextSearch pattern %r in %s" % (nextSearch.pattern, url1))
         return url2
     return _starter
 
diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py
index 93fa52f3c..f9229ff81 100644
--- a/dosagelib/plugins/b.py
+++ b/dosagelib/plugins/b.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 
diff --git a/dosagelib/plugins/clonemanga.py b/dosagelib/plugins/clonemanga.py
index 8a50f27eb..00f191c31 100644
--- a/dosagelib/plugins/clonemanga.py
+++ b/dosagelib/plugins/clonemanga.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 from re import compile
 from ..scraper import make_scraper
 from ..util import tagre, getQueryParams, fetchUrl
@@ -44,6 +44,7 @@ def add(name, shortName, imageFolder=None, lastStrip=None):
         prevSearch=_prevSearch,
         help='Index format: n',
         namer=namer,
+        url=baseUrl,
     )
     if lastStrip is None:
         attrs['starter'] = _starter
diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py
index 1442db73e..dba8e66c6 100644
--- a/dosagelib/plugins/e.py
+++ b/dosagelib/plugins/e.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, IGNORECASE
 
diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py
index 59deb08ed..5ff397156 100644
--- a/dosagelib/plugins/f.py
+++ b/dosagelib/plugins/f.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, IGNORECASE, MULTILINE
 
@@ -121,11 +121,11 @@ class Fallen(_BasicScraper):
 
 
 class FredoAndPidjin(_BasicScraper):
-    homepage = 'http://www.pidjin.net/'
+    url = 'http://www.pidjin.net/'
     stripUrl = None
     help = 'Index format: yyyy/mm/dd/name'
     imageSearch = compile(tagre('img', 'src', '(http://cdn\.pidjin\.net/wp-content/uploads/\d+/\d+/[^"]+\.png)'))
     multipleImagesPerStrip = True
     prevSearch = compile(tagre('a', 'href', '([^"]+)')+"Prev</a>")
-    starter = indirectStarter(homepage,
-       compile(tagre('a', 'href', "("+homepage+r'\d\d\d\d/\d\d/\d\d/[^"]+/)')))
+    starter = indirectStarter(url,
+       compile(tagre('a', 'href', "("+url+r'\d\d\d\d/\d\d/\d\d/[^"]+/)')))
diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py
index 45f0cfa74..0e14ac5e8 100644
--- a/dosagelib/plugins/g.py
+++ b/dosagelib/plugins/g.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 
@@ -68,9 +68,10 @@ class Goats(_BasicScraper):
 
 
 class GoneWithTheBlastwave(_BasicScraper):
-    starter = indirectStarter('http://www.blastwave-comic.com/index.php?p=comic&nro=1',
+    url = 'http://www.blastwave-comic.com/index.php?p=comic&nro=1'
+    starter = indirectStarter(url,
                               compile(r'href="(index.php\?p=comic&amp;nro=\d+)"><img src="images/page/default/latest'))
-    stripUrl = 'http://www.blastwave-comic.com/index.php?p=comic&nro=%s'
+    stripUrl = url[:-1] + '%s'
     imageSearch = compile(r'<img.+src=".+(/comics/.+?)"')
     prevSearch = compile(r'href="(index.php\?p=comic&amp;nro=\d+)"><img src="images/page/default/previous')
     help = 'Index format: n'
diff --git a/dosagelib/plugins/h.py b/dosagelib/plugins/h.py
index 918b11f56..b22089fab 100644
--- a/dosagelib/plugins/h.py
+++ b/dosagelib/plugins/h.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/i.py b/dosagelib/plugins/i.py
index d860eb874..3742c86bc 100644
--- a/dosagelib/plugins/i.py
+++ b/dosagelib/plugins/i.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/j.py b/dosagelib/plugins/j.py
index 6ea5dd018..1825d0f5a 100644
--- a/dosagelib/plugins/j.py
+++ b/dosagelib/plugins/j.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/k.py b/dosagelib/plugins/k.py
index 56914b330..2c91ddf82 100644
--- a/dosagelib/plugins/k.py
+++ b/dosagelib/plugins/k.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, IGNORECASE
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py
index c85590ee8..b7be529e1 100644
--- a/dosagelib/plugins/m.py
+++ b/dosagelib/plugins/m.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, IGNORECASE
 
diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py
index 7301f9d0c..8573898f1 100644
--- a/dosagelib/plugins/n.py
+++ b/dosagelib/plugins/n.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/nuklearpower.py b/dosagelib/plugins/nuklearpower.py
index 4a7d84df5..49e158d7d 100644
--- a/dosagelib/plugins/nuklearpower.py
+++ b/dosagelib/plugins/nuklearpower.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import make_scraper
diff --git a/dosagelib/plugins/num.py b/dosagelib/plugins/num.py
index df6cd164b..0e6cb7880 100644
--- a/dosagelib/plugins/num.py
+++ b/dosagelib/plugins/num.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 
diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py
index 649366bd0..bb225c7b8 100644
--- a/dosagelib/plugins/o.py
+++ b/dosagelib/plugins/o.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/pensandtales.py b/dosagelib/plugins/pensandtales.py
index b41a5e96f..d432f425e 100644
--- a/dosagelib/plugins/pensandtales.py
+++ b/dosagelib/plugins/pensandtales.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 from re import compile
 from ..scraper import make_scraper
 from ..util import tagre
diff --git a/dosagelib/plugins/petitesymphony.py b/dosagelib/plugins/petitesymphony.py
index 909bc3293..17e2d02f2 100644
--- a/dosagelib/plugins/petitesymphony.py
+++ b/dosagelib/plugins/petitesymphony.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import make_scraper
diff --git a/dosagelib/plugins/q.py b/dosagelib/plugins/q.py
index 58d538a70..be0192504 100644
--- a/dosagelib/plugins/q.py
+++ b/dosagelib/plugins/q.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/r.py b/dosagelib/plugins/r.py
index 12739c678..635531a0b 100644
--- a/dosagelib/plugins/r.py
+++ b/dosagelib/plugins/r.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py
index 29e30d1f0..f8a165190 100644
--- a/dosagelib/plugins/s.py
+++ b/dosagelib/plugins/s.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, MULTILINE, IGNORECASE, sub
 from os.path import splitext
diff --git a/dosagelib/plugins/snafu.py b/dosagelib/plugins/snafu.py
index d8ca2c31f..e1cbab463 100644
--- a/dosagelib/plugins/snafu.py
+++ b/dosagelib/plugins/snafu.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import make_scraper
diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py
index e9cc800ad..5b4567fbc 100644
--- a/dosagelib/plugins/t.py
+++ b/dosagelib/plugins/t.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, IGNORECASE
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/u.py b/dosagelib/plugins/u.py
index d76e6b7e4..c251c7a56 100644
--- a/dosagelib/plugins/u.py
+++ b/dosagelib/plugins/u.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 
diff --git a/dosagelib/plugins/v.py b/dosagelib/plugins/v.py
index 0bf65cbfb..aad1b2ae6 100644
--- a/dosagelib/plugins/v.py
+++ b/dosagelib/plugins/v.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 
diff --git a/dosagelib/plugins/w.py b/dosagelib/plugins/w.py
index 5510831eb..e84fdbaab 100644
--- a/dosagelib/plugins/w.py
+++ b/dosagelib/plugins/w.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, IGNORECASE
 
diff --git a/dosagelib/plugins/webcomiceu.py b/dosagelib/plugins/webcomiceu.py
index caeaaefe1..fd576f9f9 100644
--- a/dosagelib/plugins/webcomiceu.py
+++ b/dosagelib/plugins/webcomiceu.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import make_scraper
diff --git a/dosagelib/plugins/webcomicnation.py b/dosagelib/plugins/webcomicnation.py
index 7f2270eb8..19eaf0c5c 100644
--- a/dosagelib/plugins/webcomicnation.py
+++ b/dosagelib/plugins/webcomicnation.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile, IGNORECASE, DOTALL
 from ..scraper import make_scraper
diff --git a/dosagelib/plugins/wlpcomics.py b/dosagelib/plugins/wlpcomics.py
index 2436f96bc..504a4a3fe 100644
--- a/dosagelib/plugins/wlpcomics.py
+++ b/dosagelib/plugins/wlpcomics.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..util import tagre
diff --git a/dosagelib/plugins/x.py b/dosagelib/plugins/x.py
index 1311314dd..82ec0d176 100644
--- a/dosagelib/plugins/x.py
+++ b/dosagelib/plugins/x.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 
diff --git a/dosagelib/plugins/y.py b/dosagelib/plugins/y.py
index baf92e279..85d1a9432 100644
--- a/dosagelib/plugins/y.py
+++ b/dosagelib/plugins/y.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/plugins/z.py b/dosagelib/plugins/z.py
index 5dba51e80..6fb3f11b2 100644
--- a/dosagelib/plugins/z.py
+++ b/dosagelib/plugins/z.py
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012 Bastian Kleineidam
+# Copyright (C) 2012-2013 Bastian Kleineidam
 
 from re import compile
 from ..scraper import _BasicScraper
diff --git a/dosagelib/scraper.py b/dosagelib/scraper.py
index 09a31ecd2..373ca26f8 100644
--- a/dosagelib/scraper.py
+++ b/dosagelib/scraper.py
@@ -11,8 +11,8 @@ from .output import out
 class _BasicScraper(object):
     '''Base class with scrape functions for comics.
 
-    @type latestUrl: C{string}
-    @cvar latestUrl: The URL for the latest comic strip.
+    @type url: C{string}
+    @cvar url: The URL for the comic strip.
     @type stripUrl: C{string}
     @cvar stripUrl: A string that is interpolated with the strip index
         to yield the URL for a particular strip.
diff --git a/scripts/mktestpage.py b/scripts/mktestpage.py
index 1550e08e4..ac7b65547 100755
--- a/scripts/mktestpage.py
+++ b/scripts/mktestpage.py
@@ -36,13 +36,7 @@ description: a list of comic strips supported by Dosage
 <div id="comics">
 %(content)s
 </div>
-<script type="text/javascript">
-  (function() {
-    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-    po.src = 'https://apis.google.com/js/plusone.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-  })();
-</script>
+<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
 <script>
 window.onload = function() {
   var wall = new Masonry(document.getElementById('comics'), {
@@ -81,13 +75,7 @@ title: Dosage comic %(name)s
 </tr>
 </table>
 <div class="g-plusone" data-size="standard" data-annotation="inline" data-width="300"></div>
-<script type="text/javascript">
-  (function() {
-    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-    po.src = 'https://apis.google.com/js/plusone.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-  })();
-</script>
+<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
 </section>
 {%% endblock content %%}
 """
@@ -153,10 +141,10 @@ def get_testinfo(filename, modified):
                 key, entry = get_testentry(line)
                 keys.append(key)
                 update_testentry(key, entry, testinfo)
+                if num_tests % 5 == 0:
+                    print(num_tests, end=" ", file=sys.stderr)
             elif add_error and line.startswith(" E "):
                 entry["error"] = line[3:].strip()
-            if num_tests % 5 == 0:
-                print(num_tests, end=" ", file=sys.stderr)
     orphan_entries(keys, testinfo)
     save_result(testinfo, json_file)
     return testinfo