diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py
index 9ef85b532..86941db63 100644
--- a/dosagelib/plugins/a.py
+++ b/dosagelib/plugins/a.py
@@ -36,7 +36,8 @@ class AbstruseGoose(_BasicScraper):
stripUrl = url + '%s'
firstStripUrl = stripUrl % '1'
imageSearch = compile(tagre('img', 'src', r'(http://abstrusegoose\.com/strips/[^<>"]+)'))
- prevSearch = compile(tagre('a', 'href', r'(%s\d+)' % rurl) + r'« Previous')
+ prevSearch = compile(tagre('a', 'href', r'(%s\d+)' % rurl) + r'« Previous')
+ nextSearch = compile(tagre('a', 'href', r'(%s\d+)' % rurl) + r'Next »')
help = 'Index format: n (unpadded)'
textSearch = compile(tagre("img", "title", r'([^"]+)'))
diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py
index c5d85035d..57ced8a8a 100755
--- a/dosagelib/plugins/c.py
+++ b/dosagelib/plugins/c.py
@@ -46,8 +46,7 @@ class Carciphona(_BasicScraper):
stripUrl = url + 'view.php?page=%s&chapter=%s'
imageSearch = compile(tagre("div", "style", r'background-image:url\((_pages[^)]*)\)'))
prevSearch = compile(tagre("a", "href", r'(view\.php\?[^"]*)', after="prevarea"))
- latestSearch = compile(tagre("a", "href", r'(view\.php\?[^"]*)') +
- tagre("span", "class", "linkslast"))
+ latestSearch = compile(tagre("a", "href", r'(view\.php\?page=[0-9]+[^"]*)'))
help = 'Index format: None'
starter = indirectStarter(url, latestSearch)
@@ -385,8 +384,8 @@ class Curtailed(_BasicScraper):
stripUrl = url + '%s/'
firstStripUrl = stripUrl % '2012/04/08/sneeze'
rurl = escape(url)
- imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]*)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s\d{4}/[^"]*)' % rurl, after="navi-prev"))
+ imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/[0-9]+/[^"]*)' % rurl))
+ prevSearch = compile('\s*" + tagre("img", "src", r'(%sfiles/[0-9]+/[0-9]+/[^"]*Dork[^"]+\.(?:gif|jpg))' % rurl, after=' alt'))
prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl)+"Previous")
help = 'Index format: yyyy/mm/dd/stripname-dd-mm-yy'
diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py
index c6ed8f69a..5f61cb4b3 100644
--- a/dosagelib/plugins/g.py
+++ b/dosagelib/plugins/g.py
@@ -189,12 +189,12 @@ class GoneWithTheBlastwave(_BasicScraper):
class GrrlPower(_BasicScraper):
description = u'Grrl Power - A webcomic about superheroines.'
- url = 'http://www.grrlpowercomic.com/'
+ url = 'http://grrlpowercomic.com/'
rurl = escape(url)
stripUrl = url + 'archives/%s'
firstStripUrl = stripUrl % '48'
- imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%sarchives/\d+)' % rurl, after="navi-prev"))
+ imageSearch = compile(tagre("img", "src", r'(.*/comics/[^"]+)'))
+ prevSearch = compile(tagre("a", "href", r'(.*/archives/\d+)', after="navi-prev"))
help = 'Index format: number'
diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py
index 058cfdff6..b00f78689 100755
--- a/dosagelib/plugins/m.py
+++ b/dosagelib/plugins/m.py
@@ -17,12 +17,10 @@ class MacHall(_BasicScraper):
help = 'Index format: yyyy-mm-dd'
-# broken links - disable for now
class MadamAndEve(_BasicScraper):
- url = 'http://www.madamandeve.co.za/week_of_cartns.php'
+ url = 'http://www.madamandeve.co.za/'
stripUrl = None
- imageSearch = compile(r'')
- prevSearch = compile(r'